After merging this I wondered if we ought to add a controller test for this following our "test controllers when they do something interesting" policy.