Merged work-dir and test-dir