Fixing expected keys
Merge pull request #582 from jovanchohan/key_fix

Fixing expected keys