Tests and changed calculations for coverage