Fix tests broken by b2f5ed2a6bde4139aec42f55981d4c8a2523d63c.