FIX: Few test failures in multinomial CV