Fix up the unit tests and add new OID unit tests