Will fix TSUN-286
Add 2 more tests to increase coverage
Merge pull request #86 from rodo/master

Will fix TSUN-286