Shortened running time of one test.
Removed unnecessary call to Upper() on log message prefixes, added tests.