Convert tests to JUnit 4