Add coverage
Better test coverage