Updated testing and push tools to support windows