More code review feedback: better TODo comments, fixed up UTs