refactored controller specs; all tests pass