Add coverage
Add 96% of tests