cleanup before tests in case of problems
Merge pull request #843 from dimagi/testfix

cleanup before tests in case of problems