Cleaning up
Fixing JUnit test