fix move dir into dir test and add more test
rename tests