Reduce flakiness of GroupByEntityOutputSpec
Added support for --version with correct exit code