Use JUnit4 for all tests, and import everything from org.junit in separate imports.