Merge "Modifications to test_defs.xml for CoreTests files move."