This fixes #7369.  I added the integration test suite.  There is currently only one test in it.