Unrelated JUnit fixes.