Fix unit tests on i386 and other archs
Fix unit tests on i386 and other archs

Change-Id: I4f84b725e220e28919570fd7f296b63b34d0375d

psachin/swift,redbo/swift,notmyname/swift,nadeemsyed/swift,notmyname/swift,redbo/swift,psachin/swift,tipabu/swift,clayg/swift,psachin/swift,nadeemsyed/swift,clayg/swift,swiftstack/swift,openstack/swift,smerritt/swift,tipabu/swift,openstack/swift,matthewoliver/swift,swiftstack/swift,tipabu/swift,smerritt/swift,nadeemsyed/swift,nadeemsyed/swift,openstack/swift,matthewoliver/swift,smerritt/swift,clayg/swift,swiftstack/swift,matthewoliver/swift,matthewoliver/swift,smerritt/swift,notmyname/swift,clayg/swift,openstack/swift,tipabu/swift,psachin/swift,notmyname/swift