Merge branch 'master' into multidef

* master:
change test to use different postcode now that dummy data has changed