Pull TestingBucketIdProvider to top level