Added UUID's to deftests