Merge "Fix BP2ProviderTests"