Tech Debt

Moving service tests out of controller tests.