Added new tests for ObjectIdentity (s)

Also rewrote some of the verification statements.