Fixed variable declaration issue #8
Changed test to reflect varfix
Completed fn, increment and conditional codegen