added address model tests
resolved merge conflicts