Added some more test cases and started working on type checking within code generator