Issue 21176: Completed ToDo unit test and beginning work on generalizing comments