Cleaning-up tests for #GetNameList