Some of the controller testing (lots more to do)