Increase test coverages