Slightly clean up tests
Merge branch 'master' of github.com:markprzepiora/kopipe