Test revisions (pending)

Phillip asked a pull request for pending test revisions.  I don't intent to complete this merge, as this doesn't include the framework revisions we discussed.