Test cleanup

Sander, Oliver requested to merge test-cleanup into master

Merge request reports