Remove ws
Add per-test working directories