changes to make diff test pass again after oid type change