Try to make the functional test suite a little more like the regress
one.