Better testing splitting out http-test-servers