Saml2CryptoTestSupport and TestSaml2AuthenticationObjects should be simplified down to TestOpenSamlObjects since in both cases they are providing convenience factory methods for OpenSAML objects.