Preliminary restoration of code coverage for UnitTests and IntegrationTests