Merge "This removes a test that fails on 32 bit"