Adding more test and changing the objects to classes to test them