Fix cli tests with new ids.

Sorry about that, should fix the cli tests. I mis-understood what the branch build was running against.