Improved code generation testing in domain test
Merge branch 'develop'