Change the services providers from class variables to member variables to allow multitenant. Refactor test.