[Finishes #78797256] Organization API tests

Organization API unit tests; refactored the Org.builder pattern too