Make JUnit pass
Make JUnit pass