Fix/test helper lookup