Test suite fixes

Merged Ben Boeckel requested to merge ben.boeckel/catalyst:test-suite-fixes into master

Merge request reports