Add tests for helpers
Merge branch 'helpers_tests' into develop