Increase coverage to 82

Statements   : 82.07% ( 2819/3435 )
Branches     : 67.23% ( 882/1312 )
Functions    : 78.55% ( 476/606 )
Lines        : 82.94% ( 2791/3365 )