adding context, provider selection, and tests
increasing intercom test timeout
Merging