fixed wd and added t tests