Corrected issues discussed in PullReq 69
Added HTTP unit tests, minor corrections on other unit tests