Updating the controller test to make it cleaner