Fix the regression tests for 9.1