All but wd_server tests fixed.