Fix tests broken by updated deps