Added the test for the UUID generation

Brought in from old code
fixed some oddities