fix test helpers