Removed unused method.
Added a TODO.
Shuffled around test coverage for logging output capturing for testng.
Renamed a couple of test classes.
Renamed a test class
Extracted coverage for junit test output capture out to its own test class.
Split out some more coverage for junit test output capture, and synced up with coverage for testng.