Completely fix the testtol2 macro for amd64/i386..