Refactor some test to use JUnit 4.