Reworking payloads to fix problem in handling of route53 payloads. 

 Added additional tests.