Fixes few gpg-key tests and custom provider tests