disable mocks and fix an oid size bug