Merge pull request #4 from joerghoh/bugfix/fix-CleanUpTest

SLING-11346 : merge from upstream