Moving helpers to module file
Adding tests and fix for test fails
Merge pull request #1 from vijaycs85/7.x-1.x

Adding tests and fix for test fails & code cleanup