tests: More adjustments for 64bit