Add coverage and update tests.