Fix each helper and add tests for user-defined and included helpers.