Begin work on UnitTest, Tweak logging info for tests