Fix # 7.1: UnaryMinExpr has been added. Factor has been removed