Improving cleanup in HA tests for windows.