Modified GPG Unit Tests

References PR #12517

@baconz - These tests were failing when I ran them locally, so I modified them to get them passing. Feel free to take a look and see if anything is out of sync on your setup. Thanks for taking the initiative here!