Reformat
Add timeout around http request
simplify test requires
Fix setting of http response and add Timeout back to http request