cli: Refactor command options
Parallelize some tests