wd_server in a little better shape, tests still failing.