Update: some more test in Windows. It works well

Test: Change and Swap States