Test coverage tweaks