Make JUnit pass