more fixes and new test host.