Fix test failures happening on i386.
Merge pull request #942 from mozilla-services/32bit-fixes

Fix test failures happening on i386.