Fix behaviour of new matchers by having a separate one for ctrlKey and metaKey
Add tests for new behaviour