Switched to JUnit4