Moving to windows for test