Cleaned up deprecated JUnit imports.