Fixed shortcuts and added tests