Merge "Rename test directory" into main