Added TODOs after test run.