Finished unit tests for new controller code.