Make it easier to run tests
Merge pull request #17 from lstrojny/feature/test-cleanup

Make it easier to run tests