updated todo and tests.