Extract special key handling into own functions
No need for special marking here
Fix tests to use Redic everywhere