Fix unit test partially