Added some more UUID assertions