CLI Tests: Consolidate test assertions