De-staging, take two: 15_control

Move 7 passing tests out of staging, also renaming one same-named,
different-content file by incrementing the first digit in the filename.