Adds basic test coverage for controllers

This adds basic test coverage (happy path and other simple examples)
for the controllers.  It also removes a bunch of unused code where
appropriate.
Fixes deprecation issues with RSpec3
Merge branch 'feature/basic_controller_tests' into dev