remove with helper and all occurences
fix tests that were damaged by with helper removal
Merge pull request #300 from reviewninja/feature/remove-with-helper

Feature/remove with helper