Repository CLI tests now use Org ID.
Subscription CLI tests now use Org ID.