Migrate JUnit 3 tests to JUnit 4