You can now choose a valid class. Also fixed tests.