Rework CLI test harness to use exit instead of return