Fix helpers
Add tests for helpers