Improving coverage tooling