Fix tests

This fixes tests due to previous PRs.

There's one more test that should be fixed, ``` testLiteralFunctionComplexArg ```, but it's a bit harder to isolate as it fails only when running the full test suite not the single test or the bigger ``` CreateFunctionFixTest ``` test. Maybe @josehsantos has some ideas on it.


Thanks.