Fix remaining unit-tests