Corrected tests.
Updated TODOs.