Bugfixes IntermediateCodeGenerator, M2 Junit Tests