Correct the last few test failures in the 1.9.0 branch