Begin rework of Windows tests.