JUnit errors fixed