Code coverage tweaks