Refactored model controller to be easily adaptable
Fixed test DB loading
Fixed organization test
Unit tests fixed and passing