In docs: default strategy changed name to simple
Minor refactoring in lexer
Small fix in tests
New tests
Minor refactoring