Fix uuid test as 1.1 doesn't behave the same way as 1.0.x
Fix compilation due to merge