Controller specs refactored