fixed few more gpg-key tests

Here I'm using same fix that I used in PR #810. That was for repo and this is for product. I saw 4-5 tests failed while asserting key under product. Also the key locator was incorrect..updated that too.