Fix unit-tests