Add code coverage tweaks