small logic changes to test and register
class change