Added new tests for a controller and modified the controller to send the proper data.
Merge branch 'c1moore_branch' into dev