Change for 64-bit unittests