Support SAML NameID
Fixed failing unit tests