diff --git a/tests/cases/fourslash/autoFormattingOnPasting.ts b/tests/cases/fourslash/autoFormattingOnPasting.ts
index 0c7f471d43d..5c9e2c86e37 100644
--- a/tests/cases/fourslash/autoFormattingOnPasting.ts
+++ b/tests/cases/fourslash/autoFormattingOnPasting.ts
@@ -4,11 +4,11 @@
 /////**/
 ////}
 goTo.marker("");
-edit.paste(" class TestClass{\r\n\
-private   foo;\r\n\
-public testMethod( )\r\n\
-{}\r\n\
-}");
+edit.paste(` class TestClass{
+private   foo;
+public testMethod( )
+{}
+}`);
 // We're missing scenarios of formatting option settings due to bug 693273 - [TypeScript] Need to improve fourslash support for formatting options.
 // Missing scenario ** Uncheck Tools->Options->Text Editor->TypeScript->Formatting->General->Format on paste **
 //verify.currentFileContentIs("module TestModule {\r\n\
@@ -19,10 +19,9 @@ public testMethod( )\r\n\
 //}\r\n\
 //}");
 // Missing scenario ** Check Tools->Options->Text Editor->TypeScript->Formatting->General->Format on paste **
-verify.currentFileContentIs("module TestModule {\r\n\
-    class TestClass {\r\n\
-        private foo;\r\n\
-        public testMethod()\r\n\
-        { }\r\n\
-    }\r\n\
-}");
\ No newline at end of file
+verify.currentFileContentIs(`module TestModule {
+    class TestClass {
+        private foo;
+        public testMethod() { }
+    }
+}`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/forceIndentAfterNewLineInsert.ts b/tests/cases/fourslash/forceIndentAfterNewLineInsert.ts
index a076213ebb6..d4c41be01ee 100644
--- a/tests/cases/fourslash/forceIndentAfterNewLineInsert.ts
+++ b/tests/cases/fourslash/forceIndentAfterNewLineInsert.ts
@@ -1,18 +1,23 @@
 ///<reference path="fourslash.ts"/>
 
-////function f()
+////function f1()
 ////{ return 0; }
+////function f2()
+////{
+////return 0;
+////}
 ////function g()
 ////{ function h() {
 ////return 0;
 ////}}
 format.document();
 verify.currentFileContentIs(
-    "function f()\n" +
-    "{ return 0; }\n" +
-    "function g() {\n" +
-    "    function h() {\n" +
-    "        return 0;\n" + 
-    "    }\n" + 
-    "}"
-    );
+`function f1() { return 0; }
+function f2() {
+    return 0;
+}
+function g() {
+    function h() {
+        return 0;
+    }
+}`);
diff --git a/tests/cases/fourslash/formatOnEnterOpenBraceRemoveNewLine.ts b/tests/cases/fourslash/formatOnEnterOpenBraceRemoveNewLine.ts
new file mode 100644
index 00000000000..6a1d5937255
--- /dev/null
+++ b/tests/cases/fourslash/formatOnEnterOpenBraceRemoveNewLine.ts
@@ -0,0 +1,14 @@
+/// <reference path="fourslash.ts"/>
+
+//// if(true)
+//// /**/
+
+
+format.setOption("PlaceOpenBraceOnNewLineForControlBlocks", false);
+goTo.marker("");
+edit.insert("{");
+// TODO: figure out how to get rid of 3 extra spaces on second last line.
+verify.currentFileContentIs(
+    `if (true) {`);
+
+    
\ No newline at end of file
diff --git a/tests/cases/fourslash/formatRemoveNewLineAfterOpenBrace.ts b/tests/cases/fourslash/formatRemoveNewLineAfterOpenBrace.ts
new file mode 100644
index 00000000000..6309ef21805
--- /dev/null
+++ b/tests/cases/fourslash/formatRemoveNewLineAfterOpenBrace.ts
@@ -0,0 +1,15 @@
+/// <reference path="fourslash.ts"/>
+
+//// function foo()
+//// {
+//// }
+//// if (true)
+//// {
+//// }
+
+format.document();
+verify.currentFileContentIs(
+`function foo() {
+}
+if (true) {
+}`);
diff --git a/tests/cases/fourslash/formattingOfMultilineBlockConstructs.ts b/tests/cases/fourslash/formattingOfMultilineBlockConstructs.ts
index 18f497496d8..fc52df62da3 100644
--- a/tests/cases/fourslash/formattingOfMultilineBlockConstructs.ts
+++ b/tests/cases/fourslash/formattingOfMultilineBlockConstructs.ts
@@ -47,7 +47,7 @@ verify.currentLineContentIs("enum E {");
 goTo.marker('4');
 verify.currentLineContentIs("class MyClass {");
 goTo.marker('cons');
-verify.currentLineContentIs("    constructor()");
+verify.currentLineContentIs("    constructor() { }");
 goTo.marker('5');
 verify.currentLineContentIs("    public MyFunction() {");
 goTo.marker('6');
diff --git a/tests/cases/fourslash/formattingOnSingleLineBlocks.ts b/tests/cases/fourslash/formattingOnSingleLineBlocks.ts
index fc1a6818b95..67990056274 100644
--- a/tests/cases/fourslash/formattingOnSingleLineBlocks.ts
+++ b/tests/cases/fourslash/formattingOnSingleLineBlocks.ts
@@ -1,16 +1,11 @@
 /// <reference path='fourslash.ts' />
 
-/////*1*/class C
-////{}/*2*/
-/////*3*/if (true)
-////{}/*4*/
+////class C
+////{}
+////if (true)
+////{}
 
 format.document();
-goTo.marker("1");
-verify.currentLineContentIs("class C");
-goTo.marker("2");
-verify.currentLineContentIs("{ }");
-goTo.marker("3");
-verify.currentLineContentIs("if (true)");
-goTo.marker("4");
-verify.currentLineContentIs("{ }");
\ No newline at end of file
+verify.currentFileContentIs(
+`class C { }
+if (true) { }`);
\ No newline at end of file