Some of JUnit fixes