Fix test for code coverage generator
Fix tests
Fix CS Errors