converted to OOP, added second test