Now that we have the ability to specify command-line arguments in tests, we can test more of the 'main' module. In particular, we can test the query and format commands in modes that we couldn't previously exercise.
