update tests && adjust directory 

update tests && adjust directory