Merge "Adding logging to JUnit"