Cleanup tests
Merge pull request #492 from kevva/cleanup-tests

Cleanup tests