Fixes few gpg-key tests and custom provider tests
Merge pull request #922 from kbidarkar/fix-gpg-key-tests

Fixes few gpg-key tests and custom provider tests