Last tests added. Coverage = 80.2%