modified cli-test suite