Windows support

Integrate the new proper test fix.