Can you move this test into the `integration-cli` test framework.  It will be much simpler.