Refactored controller to finalised test specs