Make tests compile again, residualize division by zero