Merge "Common testcase directories: Clean up duplicates"