fix - now all the var-test-cases in generator work