More code improvements for code coverage