Filling out CLI and tests therefor