Fix remaining test failure