Fix ProviderSelection tests
DeployableMatching tests