Add TODO.
Fix tests dependency.