test method refined & lexer bugs fixed