Fix tests which broke with c4b31d0