Continued work on refactoring logging to handle different types of tests.