More tests
Improved Lexer testing