Huge cleanup of tests
Merge pull request #28 from floatdrop/rewrite-of-tests

Huge cleanup of tests