Fixes to tests for 64 bit