Cleaned-up key conversion with a more cleaner
 approach. 
Tests passing bur orphaned keys in Redis that require cleanup.