Fix bug in recently improved test helpers