Add coverage and fix tests