Fix cleanup of tests
Merge branch 'fix-spock-cleanup' of pull request #107