Fixes in ProviderLocator, reenabled test