Expanded and refactored organizationControllerTests