FIX small problems in broken unit tests