Add helper and update test