Fix test cleanup to add Supplier table