Move more tests to JUnit 4