diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e94bbda3067..75173afd8f19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 2020.3.0-rc (9 March 2020)
+## 2020.3.0 (19 March 2020)
 
 ### Enhancements
 
@@ -114,6 +114,8 @@
    ([#10311](https://github.com/Microsoft/vscode-python/issues/10311))
 1. When you install missing dependencies for Jupyter successfully in an active interpreter also set that interpreter as the Jupyter selected interpreter.
    ([#10359](https://github.com/Microsoft/vscode-python/issues/10359))
+1. Ensure default `host` is not set, if `connect` or `listen` settings are available.
+   ([#10597](https://github.com/Microsoft/vscode-python/issues/10597))
 
 ### Code Health
 
@@ -135,8 +137,6 @@
    ([#10182](https://github.com/Microsoft/vscode-python/issues/10182))
 1. Use debugpy in the core extension instead of ptvsd.
    ([#10184](https://github.com/Microsoft/vscode-python/issues/10184))
-1. Remove UI Tests.
-   ([#10192](https://github.com/Microsoft/vscode-python/issues/10192))
 1. Add telemetry for imports in notebooks.
    ([#10209](https://github.com/Microsoft/vscode-python/issues/10209))
 1. Update data science component to use `debugpy`.
diff --git a/news/2 Fixes/10597.md b/news/2 Fixes/10597.md
deleted file mode 100644
index c666d8d8d5b4..000000000000
--- a/news/2 Fixes/10597.md	
+++ /dev/null
@@ -1 +0,0 @@
-Ensure default `host` is not set, if `connect` or `listen` settings are available.
diff --git a/package-lock.json b/package-lock.json
index 5a8f0b02651e..a72f68510a9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "python",
-    "version": "2020.3.0-rc",
+    "version": "2020.3.0",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
diff --git a/package.json b/package.json
index 4e5e760cf614..22452ea07ffb 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "python",
     "displayName": "Python",
     "description": "Linting, Debugging (multi-threaded, remote), Intellisense, Jupyter Notebooks, code formatting, refactoring, unit tests, snippets, and more.",
-    "version": "2020.3.0-rc",
+    "version": "2020.3.0",
     "languageServerVersion": "0.5.30",
     "publisher": "ms-python",
     "author": {
diff --git a/src/test/common/platform/filesystem.functional.test.ts b/src/test/common/platform/filesystem.functional.test.ts
index f4de46ef3370..1d2a9a8f95ec 100644
--- a/src/test/common/platform/filesystem.functional.test.ts
+++ b/src/test/common/platform/filesystem.functional.test.ts
@@ -8,7 +8,8 @@ import * as fs from 'fs-extra';
 import { convertStat, FileSystem, FileSystemUtils, RawFileSystem } from '../../../client/common/platform/fileSystem';
 import { FileSystemPaths, FileSystemPathUtils } from '../../../client/common/platform/fs-paths';
 import { FileType } from '../../../client/common/platform/types';
-import { sleep } from '../../../client/common/utils/async';
+import { createDeferred, sleep } from '../../../client/common/utils/async';
+import { noop } from '../../../client/common/utils/misc';
 import {
     assertDoesNotExist,
     assertFileText,
@@ -267,13 +268,24 @@ suite('FileSystem - raw', () => {
             }
         });
 
+        async function writeToStream(filename: string, write: (str: fs.WriteStream) => void) {
+            const closeDeferred = createDeferred();
+            const stream = fileSystem.createWriteStream(filename);
+            stream.on('close', () => closeDeferred.resolve());
+            write(stream);
+            stream.end();
+            stream.close();
+            stream.destroy();
+            await closeDeferred.promise;
+            return stream;
+        }
+
         test('returns the correct WriteStream', async () => {
             const filename = await fix.resolve('x/y/z/spam.py');
             const expected = fs.createWriteStream(filename);
             expected.destroy();
 
-            const stream = fileSystem.createWriteStream(filename);
-            stream.destroy();
+            const stream = await writeToStream(filename, noop);
 
             expect(stream.path).to.deep.equal(expected.path);
         });
@@ -283,9 +295,7 @@ suite('FileSystem - raw', () => {
             await assertDoesNotExist(filename);
             const data = 'line1\nline2\n';
 
-            const stream = fileSystem.createWriteStream(filename);
-            stream.write(data);
-            stream.destroy();
+            await writeToStream(filename, s => s.write(data));
 
             await assertFileText(filename, data);
         });
@@ -294,9 +304,7 @@ suite('FileSystem - raw', () => {
             const filename = await fix.resolve('x/y/z/spam.py');
             const data = '... 😁 ...';
 
-            const stream = fileSystem.createWriteStream(filename);
-            stream.write(data);
-            stream.destroy();
+            await writeToStream(filename, s => s.write(data));
 
             await assertFileText(filename, data);
         });
@@ -305,9 +313,7 @@ suite('FileSystem - raw', () => {
             const filename = await fix.createFile('x/y/z/spam.py', '...');
             const data = 'line1\nline2\n';
 
-            const stream = fileSystem.createWriteStream(filename);
-            stream.write(data);
-            stream.destroy();
+            await writeToStream(filename, s => s.write(data));
 
             await assertFileText(filename, data);
         });