[ISSUE-3] Fix tests