Handle coverage in a separate PR