Fix tests after changes of 31a445b0