fix tests in 32-bit and modify Factors again