TEST: More fixes to unit tests

Paul McCarthyrequested to merge
test/out-of-source into master

Merge request reports