N-400: Go through your N-400 thoroughly. Have all the changes since you filed the original form, printed out, so it can be conveniently handed over.
English test: As you have posted 9 times, you pass.
Civic test: 96 questions from the "Sample civic questions" from "A guide to naturalisation". For a little more information check out publication M-638. If you want to be more thorough search for usstruct.pdf and ushist.pdf in the uscis website.
And yes, these are my thoughts.
