Fixing issues of tests and coverage reports