Add support for ServiceProviders to the DI Container

Update test to use mock properly