Merge pull request #2 from novirael/bug_1562

bug #1562 - new tests