CI, Coverage fixes