Updated test directory structure