more test cleanup

Raphaël Gomèsrequested to merge
topic/default/test-cleanup into branch/default

Merge request reports