Explicit coverage.
Cleaned up a bunch of tests.