Added test data for towns
resolved merge conflict