added better and clearner tests to helpers module
Merge branch 'develop'