Some minor changes to unit tests, plus integration of HTTPd.