Fix test helper once and for all