Add coverage and move import into tests.