Rejigged support loading to provide two points for injection. Added timeout option for test server. Added debug option for test server.