Merge "Fix tests for 64b"