Correcting deprecated JUnit imports