class methods implemented, tests fixed all passed