Make the UniqueId function really return unique id; Add a test case to p...

...rove it fixed
Minor readability issue: this data file has strange indentation -- replace tabs with 4 spaces.