#744 - Adding provider and location class so can get them in the tests.