Simplify CLI test a bit.