moved class, added test