added tests for shortcuts, and removed candidates in place of commands