Improved Controller tests