Add rules for new test programs, change rules for renaming of