Initial class definition for Organization
Modify test for Organization
fixing merge