Improved support for UUIDs plus tests.