Fix combined test input files (#3485)