Merge pull request #41 from ggear/graham-patch-CDH-12802

Improve Integration test harness and test coverage