issue-4 - added more tests