Moved pre-cleanup to before running test suite
Small changes for stability.
Merge pull request #76 from bpwook/async-bug-fix

Async bug work-around