Some styling and commenting
First API tests for organization handling