PER-107: fixed unit tests after merge