Fix tests after adding lineNumber for functions without return expression
Buildserver auto merge