Merge "Extend compute-manage cli tests"