Do more conversions to JUnit 4