Fix whitespace and matching "end" clauses.
Add unused tests to their suites.
Merge pull request #631 from cgay/dev

Add unused tests to their suites.