Fixed tests for 64-bit