Added coverage for identity to identities.
Added  support for criteria, criterion and curve.