Fix the unit-tests (once again...)