Fix test for 32 bit, last changes.