Tweak cli integration tests

The changes made by this PR speed up the execution of the cli integration tests by approximately 28 seconds. This lowers the execution time of the cli integration tests from 170 seconds to 142 seconds on one machine.