Fix failing tests introduced by ba6e7ea