Re-added JUnit imports in tests