cleanup before testing.
Merge branch 'master' of https://github.com/lastebil/Sahli