Fix tests broken by 63c490b3