Use macros and fix test for libuuid-devel