fixing string keys in a better way
adding test for different key formats