Improved tests for controller