refactor tests from Dir
refactor Dir to use prefixes and path separation