Add additional tests for controllers and get suite passing