Move ToDo comment to go with test that covers it

Move ToDo comment to go with test that covers it