Add coverage and tweak other configurations