ISSUE-107 Adding unit tests