Updated Controllers to implement interfaces to allow mocking