Merge pull request #224 from akkie/master

Add test helpers
Fixes #223