Made some progress on Lexer and associated tests