Tweaks to the unit tests for NameListModel