fixed string fixer and lex to work with tests. added null so while tests work in expression for ;