Reinstate tests for wedge partition selection optimizations. This reinstates the tests from commit efda2831e5f758b4f350679b5c55c0b9282449b0 with the appropriate fixes for 32 bit x86 builds. Change-Id: Ib331906c5b448ca964895ee9cbfd4266f67d1089