Fixed tests and removed SAML stuff