Merge "Run standalone tests in both 32- and 64-bit"