Fix unit tests issue