Improved code coverage in unit tests