Convert all tests to helpers