Fix CLI v2 tests for workflows

Change-Id: I35307fb535efa4bda821730e947fd16a30b0a076