Make the setup process a little easier to handle.
Correct some paths.
Corrected indenting.
Stop the CLI server automatically during testing.

Remove the old "query" tags.  Neat, but unhelpful.