Merge pull request #1255 from marcel-blonk/PLFM-2734

make test cleanup reliable