moar cleanup
Merge pull request #642 from boegel/test_cleanup

moar cleanup