Improved tests for controllers