Small test fixes

Open feld requested to merge test_cleanup into develop

Merge request reports