add uuid test
Merge remote-tracking branch 'origin/master' into tidy-up/quotes