Change helper tests to use