Move some class references to imports.
Reinstate assertNotEquals (requires junit 4.11).