Fix test helpers.