Allow for specifying the test definition to not be in saml2base
Clean up