Impleminting the use of federationIdentityPlugin. Fixing tests.