Merge "Fix tests for 64-bit."