Fixing unit tests

I fixed the test_names.py unit tests to work with the new output structure and use the new command line arguments. More tests are needed for some of the new command line arguments introduced.

Would it be possible to run these as part of the Travis CI build so they don't get missed in the future? I think it's useful to have automated verification that the command line switches are working correctly as things change, as there are quite a few combinations.