Repair tests and other fixes

revert accidentally pushed commit and fix test failures introduced by !192

See merge request !216
17 jobs for feat/cli_request_file
in 0 seconds, using 0 compute credits, and was queued for 0 seconds