Fix some JUnit test errors