Cleanup tests
Merge pull request #533 from kevva/test-clean

Cleanup tests