More JUnit tests/removed unused function from Report