refactor lexer
update lexer tests to use new method names