Postcode field added and all tests created and pass as expected
Fixed merge conflicts