Make test_RemoveKey pass