More refactoring to allow testing of other provisioner transports