more space in directory name fixes plus a test for directories with space