fixed tests due to a previously bad commit
fixed tests due to a previously bad commit

also, expression function argument callback removes any
reference operator from the variable name

robertop/pelet,robertop/pelet,robertop/pelet,robertop/pelet