Building universal binaries
Fixed broken tests by forcing i386 when needed.