Merge pull request #126 from evoskuil/version2

Use comparative test helpers, test one thing, remove dead code.