Changes to testing class. Added more tests