More uniitests
Merge pull request #2 from 8r2y5/bug_4682

Added tests