Changed var assignation and expr to fullfil the requirements of types expressed by Santosh
Modified test cases, left one error because it causes an exception on function parameter type checking