Fix the unit-tests