Modify some tests to use consignments