Controller tests & test fixes

Create the new controller tests. Fix several tests that failed because of new code.

Request to merge with master.