Remove unnecessary comments from keymap
Add spec to test current behavior