Updates for extended key retrieval testing.