Correct log messages to account for refactoring

Also fixes some javadoc in tests.