Fix unit tests failure