Make tests use assertEquals() rather than assertTrue & cleanup imports