Restore 100% coverage.

Some tests are still failing. :(