Tidy up and add to ProposalControllerTests