Fixed unit test failures introduced by the previous commit from the merge request