Minor cleanup of JUnit.