Fix test for PHP 5.3
Refactor Lexer