adapting http unit tests to changes in 4334fc0. Modbus unittests still broken.