Merge "Fix 32-bit issues in tests, and add a trivial test for the FD_* macros."