Refactor some of the integration tests.#1763

aaronweeden merged 2 commits intoubccr:xdmod11.0ubccr/xdmod:xdmod11.0from

aaronweeden:refactor-integration-testsaaronweeden/xdmod:refactor-integration-testsCopy head branch name to clipboard