Finishing name-oid bound mode. Tests. Fixing samples.