Fix an issue where we weren't testing the key was being fetched from
the right location, then fix the problem where the key wasn't being
fetched from the right location.  I'm glad it's friday!