Fix for incomplete unit tests for ClassCodeConverter
Merge branch 'master' into sourcecodegenerator
Merge branch 'sourcecodegenerator'