Issue #372: separate cleaning from test execution.
Merge pull request #409 from jawi/issue372

Issue #372: separate cleaning from test execution.