Added testing for controllers.