Minor fix for "Names etc list" + unit tests