Add tests for helpers