Another refactor of systests/transports to make the https tests more manageable