Convert to JUnit 4-proper