PER-107: fixed failing unit tests