Test improvements

Hines, Jesserequested to merge
test-updates into develop

Some improvements to the test fixtures and cleanup to avoid left over files.

Merge request reports