This reinstates the tests from commit efda2831 with the appropriate fixes for 32 bit x86 builds. Change-Id: Ib331906c5b448ca964895ee9cbfd4266f67d1089