Minor refactorings on the ProposalService and tests