Fix unit test issue