test and function updated to support uuid