Merge "Remove name appendix of .TEST_CONFIG"