Simplify a few acceptance tests for illustration.

Expect a big-bang PR following this one.  These two changes illustrate
how to use the newly refactored code.