Added the 32 bit part. Still need testing.
Removed the diff from the test.