This fixes a rather embarrassing bug in ShortcutManager that happened because I forgot to add the tests I meant to add.

This fixes the bug, and adds the tests.