Fix rmClass

Add tests