Updates to Marriage abroad V2

Several updates; errors and omissions from last round of changes
Update tests for Marriage Abroad V2

Updating tests for most recent updates
Merge pull request #309 from alphagov/marriage-abroad-v2

Updates to Marriage abroad V2