Adding test case for queries based on the IdentityType.
Merge remote-tracking branch 'upstream/master'