Allow the tests to be run with variable levels of verbosity
Add in test code that missed the previous commit.