improve testhelpers
Merge pull request #1106 from crate/m/testhelpers_improve

improve testhelpers