Try to fix busted tests from move to JUnit 4