Fixed a misapplication of uuids, where we were using a macro to generate deftests.