Moved some things around in the Lexer class, added Lexer unit tests.