diff --git a/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs b/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs
index cac5476..013950b 100644
--- a/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs
+++ b/ClosedXML_Tests/Excel/CalcEngine/TextTests.cs
@@ -9,7 +9,7 @@
     [TestFixture]
     public class TextTests
     {
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void Init()
         {
             // Make sure tests run on a deterministic culture
@@ -17,17 +17,15 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Char_Empty_Input_String()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Char("""")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Char("""")"), Throws.Exception);
         }
 
         [Test]
-        [ExpectedException]
         public void Char_Input_Too_Large()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Char(9797)");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Char(9797)"), Throws.Exception);
         }
 
         [Test]
@@ -55,11 +53,10 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Code_Empty_Input_String()
         {
             // Todo: more specific exception - ValueException?
-            Object actual = XLWorkbook.EvaluateExpr(@"Code("""")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Code("""")"), Throws.Exception);
         }
 
         [Test]
@@ -83,10 +80,9 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Dollar_Empty_Input_String()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Dollar("", 3)");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Dollar("", 3)"), Throws.Exception);
         }
 
         [Test]
@@ -123,32 +119,28 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Find_Start_Position_Too_Large()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Find(""abc"", ""abcdef"", 10)");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Find(""abc"", ""abcdef"", 10)"), Throws.Exception);
         }
 
         [Test]
-        [ExpectedException]
         public void Find_String_In_Another_Empty_String()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Find(""abc"", """")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Find(""abc"", """")"), Throws.Exception);
         }
 
         [Test]
-        [ExpectedException]
         public void Find_String_Not_Found()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Find(""123"", ""asdf"")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Find(""123"", ""asdf"")"), Throws.Exception);
         }
 
         [Test]
-        [ExpectedException]
         public void Find_Case_Sensitive_String_Not_Found()
         {
             // Find is case-sensitive
-            Object actual = XLWorkbook.EvaluateExpr(@"Find(""excel"", ""Microsoft Excel 2010"")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Find(""excel"", ""Microsoft Excel 2010"")"), Throws.Exception);
         }
 
         [Test]
@@ -165,10 +157,9 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Fixed_Input_Is_String()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Fixed(""asdf"")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Fixed(""asdf"")"), Throws.Exception);
         }
 
         [Test]
@@ -304,10 +295,9 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Rept_Start_Is_Negative()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Rept(""Francois"", -1)");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Rept(""Francois"", -1)"), Throws.Exception);
         }
 
         [Test]
@@ -352,10 +342,9 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Search_No_Parameters_With_Values()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Search("""", """")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Search("""", """")"), Throws.Exception);
         }
 
         [Test]
@@ -366,38 +355,33 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Search_Start_Position_Too_Large()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Search(""abc"", ""abcdef"", 10)");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Search(""abc"", ""abcdef"", 10)"), Throws.Exception);
         }
 
         [Test]
-        [ExpectedException]
         public void Search_Empty_Input_String()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Search(""abc"", """")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Search(""abc"", """")"), Throws.Exception);
         }
 
         [Test]
-        [ExpectedException]
         public void Search_String_Not_Found()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Search(""123"", ""asdf"")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Search(""123"", ""asdf"")"), Throws.Exception);
         }
 
         [Test]
-        [ExpectedException]
         public void Search_Wildcard_String_Not_Found()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Search(""soft?2010"", ""Microsoft Excel 2010"")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Search(""soft?2010"", ""Microsoft Excel 2010"")"), Throws.Exception);
         }
 
         [Test]
-        [ExpectedException]
         public void Search_Start_Position_Too_Large2()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Search(""text"", ""This is some text"", 15)");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Search(""text"", ""This is some text"", 15)"), Throws.Exception);
         }
 
         // http://www.excel-easy.com/examples/find-vs-search.html
@@ -524,10 +508,9 @@
         }
 
         [Test]
-        [ExpectedException]
         public void Value_Input_String_Is_Not_A_Number()
         {
-            Object actual = XLWorkbook.EvaluateExpr(@"Value(""asdf"")");
+            Assert.That(() => XLWorkbook.EvaluateExpr(@"Value(""asdf"")"), Throws.Exception);
         }
 
         [Test]