Merge pull request #275 from Alexpux/mingw-w64-builds

Correct convert architecture to bits in tests.
Merge commit '774e7330391511c282a7be447a1e333de51fc359' into mingw-w64-builds