Fix tests broken by the previous change