Update tests to JUnit 4