Merge "Separate old and new test config files."