Small refactoring
Fix lexer add tests
Add parsing test