FIX: Fixing tests for 32-bit