added todo's after test race