OK, that makes sense.  If we decide to add that, it should be a separate PR due to the breadth of changes it introduces to the acceptance tests.