Shortcuts added (ctrl q and ctrl s) for tests