Fix tests after changes in cleanup functions

2 jobs for master in 23 minutes and 44 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #2735
test

00:11:43

 
  Build
passed #2736
build

00:12:00