Updated tests to work (or be disabled) on Win