Fix a unit test which has been broken by the previous merge