improve testhelpers