Fixes for controller and controller test (laravel 4.1 support)