Convert eager creation of resources into lazy creation to pick up config changes during the tests.