Fix IntegerExpression + More unittests