Fixed more 32-bit tests