tweak test helpers
Merge branch 'master' of github.com:tily/q3