Uncomment some TestKeyConverter checks (and make them todos)