Fix test failure from earlier merge