Fix test failures on update of scikit learn