Updated SyntaxLogic and its test