AH-374 new test and deferred update
Merge remote-tracking branch 'origin/AH-374_ImprovingCodeCoverage' into AH-374_ImprovingCodeCoverage
Merge remote-tracking branch 'origin/AH-374_ImprovingCodeCoverage' into AH-374_ImprovingCodeCoverage