added explicity timeout, HTTP testserver, bug fixes to make all tests succeed