Fixed source data to reflect new address structure.

Updated data loader to reflect change.

Updated test.