Refactored controller tests
Updated all tests