Fix tests for 64b

These tests make assumptions about pointer sizes.

Change-Id: Idfd410144393d716ae176a6e9a51c5b414e0888e
2 files changed