This patch changes test to remove Windows-specific limitations and potential
rounding errors in the calculation of a UDF.

Also corrects a minor merge conflict.