Expanded test for x86-pc-windows-gnu and x86_64-pc-windows-gnu environments.