[test/integration-cli] small cleanups of FIXME(s) Upstream-commit: 4da83efdfbbbb8a69ae155fc1998cfbc7b070b1c Component: engine