CI tool test fixes

DeLozier, Jennarequested to merge
ci-tool-test-fixes into dev

Merge request reports