Tests: More CLI Tests