diff --git a/ICSharpCode.NRefactory.Tests/FormattingTests/TestKeepReformattingRules.cs b/ICSharpCode.NRefactory.Tests/FormattingTests/TestKeepReformattingRules.cs
index c0a47e3e7c..4ad30f277f 100644
--- a/ICSharpCode.NRefactory.Tests/FormattingTests/TestKeepReformattingRules.cs
+++ b/ICSharpCode.NRefactory.Tests/FormattingTests/TestKeepReformattingRules.cs
@@ -34,11 +34,10 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 	public class TestKeepReformattingRules : TestBase
 	{
 		[Test()]
-		public void TestKeepCommentsAtFirstColumnTrue ()
+		public void TestKeepCommentsAtFirstColumnTrue()
 		{
-			var policy = FormattingOptionsFactory.CreateMonoOptions () {
-				KeepCommentsAtFirstColumn = true
-			};
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.KeepCommentsAtFirstColumn = true;
 
 			Test(policy, @"class Test
 {
@@ -59,9 +58,9 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		[Test()]
 		public void TestKeepCommentsAtFirstColumnFalse()
 		{
-			var policy = FormattingOptionsFactory.CreateMonoOptions () {
-				KeepCommentsAtFirstColumn = false
-			};
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.KeepCommentsAtFirstColumn = false;
+
 			Test(policy, @"class Test
 {
 	void TestMe ()
@@ -83,10 +82,9 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		[Test()]
 		public void TestKeepCommentsAfterStatement()
 		{
-			var policy = FormattingOptionsFactory.CreateMonoOptions () {
-				KeepCommentsAtFirstColumn = true
-			};
-
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.KeepCommentsAtFirstColumn = true;
+			
 			Test(policy, @"class Test
 {
 	void TestMe ()
diff --git a/ICSharpCode.NRefactory.Tests/FormattingTests/TestWrapping.cs b/ICSharpCode.NRefactory.Tests/FormattingTests/TestWrapping.cs
index 0932b2d4fa..5a34272ad3 100644
--- a/ICSharpCode.NRefactory.Tests/FormattingTests/TestWrapping.cs
+++ b/ICSharpCode.NRefactory.Tests/FormattingTests/TestWrapping.cs
@@ -37,10 +37,9 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		[Test()]
 		public void TestInitializerWrapAlways()
 		{
-			var policy = FormattingOptionsFactory.CreateMonoOptions () {
-				ArrayInitializerWrapping = Wrapping.WrapAlways
-			};
-
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.ArrayInitializerWrapping = Wrapping.WrapAlways;
+			
 			Test(policy, @"class Test
 {
 	void TestMe ()
@@ -64,9 +63,8 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		[Test()]
 		public void TestInitializerDoNotWrap()
 		{
-			var policy = FormattingOptionsFactory.CreateMonoOptions () {
-				ArrayInitializerWrapping = Wrapping.DoNotWrap
-			};
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.ArrayInitializerWrapping = Wrapping.DoNotWrap;
 
 			Test(policy,
 @"class Test
@@ -91,11 +89,10 @@ namespace ICSharpCode.NRefactory.CSharp.FormattingTests
 		[Test()]
 		public void TestInitializerBraceStyle()
 		{
-			var policy = FormattingOptionsFactory.CreateMonoOptions () {
-				ArrayInitializerWrapping = Wrapping.WrapAlways,
-				ArrayInitializerBraceStyle = BraceStyle.NextLine
-			};
-
+			var policy = FormattingOptionsFactory.CreateMono();
+			policy.ArrayInitializerWrapping = Wrapping.WrapAlways;
+			policy.ArrayInitializerBraceStyle = BraceStyle.NextLine;
+			
 			Test(policy, @"class Test
 {
 	void TestMe ()