Feedback from pull request, fixing my silly mistakes.

Swapped $repo_path in for the gpgkey path and updated all tests