ISSUE-36: fixed the tests