Updated CLI tests