[WIN] - Make all tests pass