some tidying up
Merge branch 'nd_charge' of github.com:landregistry/acceptance-tests into nd_charge