More CLI tests