Fix test helpers