moved class; added test