GPG unit test fixes