Fix test cases related to UUID generation
Add mapWith test