Update testing directory structure
Update testing directory structure