Support for variable expressions with function (currently min, max, random), test fixes