Massive infra provider update

Generally aimed to address failures in Jenkins, but largely an attempt to
simplify the setup of infrastructure providers and prepare these fixtures for
conversion to the new system once the infra provider classes are implemented there.
Merge pull request #286 from seandst/add-provider-fixes

Massive infra provider update