Merge pull request #273 from rjc123/newmappings

Resolve indelicate mapping regarding marriage abroad
Fix CRB homepage test