Modify tests for directory restructure
Fix tests for directory restructure