Further improvements of code coverage