Made tests run in x64 as well as x86