repaired emma code coverage generation
Merge branch 'repaired_emma'