Overrides for singleton objects have passed their unit test, and update the comment.