test fix for exceptions during clean up
Merge pull request #154 from Danny-Hazelcast/testFix

test fix for exceptions during clean up