really last JUnit fixes