Add tests for Add/EditProposalForm

Squashed some bugs in the process