Clean up of controllers and creating new tests for controllers