Add unit tests
Test coverage 100%
A little fix
Merge pull request #2 from kszeluk/bug_710

Add unit tests