test; generate in triage dir
fixed; repopulating modified populated paths

closes #1697
Don't pluralize model names not ending with letters

closes #1703
refactor 1703 tests