Converted tests to 64-bit