fixed directory clashes and added test-directory-clash