Fix unit-test