Complete organization controller tests and implementation

organization feature tests PENDING