Fix the test broken by the previous merge