Add tests for helpers

And elsewhere?