Improved clone tests and added UUID