Finishing with SAML SSO Metadata support and adding unit tests
Renaming correct keys