Added 64-bit support for tests