- Add test for helper template usage
- A bit of test love and better temp cleanup