Additional tests that show that data merging is not working consistently...
... Time to fence in onm-address-token-resolver.js with unit tests and get all the bugs out.