Repair other tests following the merge of the new backend.