Merge pull request #2972 from nrwahl2/nrwahl2-fixes
Test: cts-cli: Fix invalid scope warning and add two tests