Change Test to use random keys
Revert "Change Test to use random keys"

This reverts commit 959a0e214b272dd3d5ff8029e4ae9b064d3e1e5e.
Revert "Revert "Change Test to use random keys""

This reverts commit 36c145701aa57cc347f85645c802c661fec3396b.