Update failing tests for ProviderBootstrapper.

Closes #3317.