Fix tests broken - as expected - by previous commit