Add coverage testing
Fix test coverage