Tidied up controller spec