Repairing coverage.
Updated TODO.