diff --git a/Cypher.Tests/Cypher.Tests.csproj b/Cypher.Tests/Cypher.Tests.csproj
index edca2d6..1857618 100644
--- a/Cypher.Tests/Cypher.Tests.csproj
+++ b/Cypher.Tests/Cypher.Tests.csproj
@@ -38,10 +38,26 @@
       <HintPath>..\packages\FluentAssertions.4.0.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -50,18 +66,31 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="TechTalk.SpecFlow, Version=1.4.0.0, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
-      <HintPath>..\packages\SpecFlow.1.4.0\lib\TechTalk.SpecFlow.dll</HintPath>
+    <Reference Include="TechTalk.SpecFlow, Version=1.9.0.77, Culture=neutral, PublicKeyToken=0778194805d6db41, processorArchitecture=MSIL">
+      <HintPath>..\packages\SpecFlow.1.9.0\lib\net35\TechTalk.SpecFlow.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="EncryptPlainText.feature.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>EncryptPlainText.feature</DependentUpon>
+    </Compile>
+    <Compile Include="EncryptPlainTextSteps.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="EncryptPlainText.feature">
+      <Generator>SpecFlowSingleFileGenerator</Generator>
+      <LastGenOutput>EncryptPlainText.feature.cs</LastGenOutput>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Cypher.Tests/Cypher.Tests.v2.ncrunchproject b/Cypher.Tests/Cypher.Tests.v2.ncrunchproject
new file mode 100644
index 0000000..4a2a2fa
Binary files /dev/null and b/Cypher.Tests/Cypher.Tests.v2.ncrunchproject differ
diff --git a/Cypher.Tests/EncryptPlainText.feature b/Cypher.Tests/EncryptPlainText.feature
new file mode 100644
index 0000000..90c2552
--- /dev/null
+++ b/Cypher.Tests/EncryptPlainText.feature
@@ -0,0 +1,46 @@
+Feature: Encrypt Plain Text
+	
+	As a privacy nut I would like to encrypt text in the worst possible way by using a substitution cypher
+
+	The cypher will replace each letter with another letter. Each letter will be used exactly once.
+
+	My plain and text will be case insensitive and punctuation marks will not be encrypted
+
+Scenario: A simple plain text using all letters from the alphabet
+	Given the plain text
+	"""
+	the quick brown fox jumps over the lazy dog
+	"""
+	When I encrypt the text using the following letter substitution
+	| Plain text letter | Cypher text letter |
+	| A                 | B                  |
+	| B                 | C                  |
+	| C                 | D                  |
+	| D                 | E                  |
+	| E                 | F                  |
+	| F                 | G                  |
+	| G                 | H                  |
+	| H                 | I                  |
+	| I                 | J                  |
+	| J                 | K                  |
+	| K                 | L                  |
+	| L                 | M                  |
+	| M                 | N                  |
+	| N                 | O                  |
+	| O                 | P                  |
+	| P                 | Q                  |
+	| Q                 | R                  |
+	| R                 | S                  |
+	| S                 | T                  |
+	| T                 | U                  |
+	| U                 | V                  |
+	| V                 | W                  |
+	| W                 | X                  |
+	| X                 | Y                  |
+	| Y                 | Z                  |
+	| Z                 | A                  |
+	Then the cypher text should be
+	"""
+	UIF RVJDL CSPXO GPY KVNQT PWFS UIF MBAZ EPH
+	"""
+	
\ No newline at end of file
diff --git a/Cypher.Tests/EncryptPlainText.feature.cs b/Cypher.Tests/EncryptPlainText.feature.cs
new file mode 100644
index 0000000..9923eed
--- /dev/null
+++ b/Cypher.Tests/EncryptPlainText.feature.cs
@@ -0,0 +1,175 @@
+// ------------------------------------------------------------------------------
+//  <auto-generated>
+//      This code was generated by SpecFlow (http://www.specflow.org/).
+//      SpecFlow Version:1.9.0.77
+//      SpecFlow Generator Version:1.9.0.0
+//      Runtime Version:4.0.30319.42000
+// 
+//      Changes to this file may cause incorrect behavior and will be lost if
+//      the code is regenerated.
+//  </auto-generated>
+// ------------------------------------------------------------------------------
+#region Designer generated code
+#pragma warning disable
+namespace Cypher.Tests
+{
+    using TechTalk.SpecFlow;
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "1.9.0.77")]
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [NUnit.Framework.TestFixtureAttribute()]
+    [NUnit.Framework.DescriptionAttribute("Encrypt Plain Text")]
+    public partial class EncryptPlainTextFeature
+    {
+        
+        private static TechTalk.SpecFlow.ITestRunner testRunner;
+        
+#line 1 "EncryptPlainText.feature"
+#line hidden
+        
+        [NUnit.Framework.TestFixtureSetUpAttribute()]
+        public virtual void FeatureSetup()
+        {
+            testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
+            TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Encrypt Plain Text", @"
+As a privacy nut I would like to encrypt text in the worst possible way by using a substitution cypher
+
+The cypher will replace each letter with another letter. Each letter will be used exactly once.
+
+My plain and text will be case insensitive and punctuation marks will not be encrypted", ProgrammingLanguage.CSharp, ((string[])(null)));
+            testRunner.OnFeatureStart(featureInfo);
+        }
+        
+        [NUnit.Framework.TestFixtureTearDownAttribute()]
+        public virtual void FeatureTearDown()
+        {
+            testRunner.OnFeatureEnd();
+            testRunner = null;
+        }
+        
+        [NUnit.Framework.SetUpAttribute()]
+        public virtual void TestInitialize()
+        {
+        }
+        
+        [NUnit.Framework.TearDownAttribute()]
+        public virtual void ScenarioTearDown()
+        {
+            testRunner.OnScenarioEnd();
+        }
+        
+        public virtual void ScenarioSetup(TechTalk.SpecFlow.ScenarioInfo scenarioInfo)
+        {
+            testRunner.OnScenarioStart(scenarioInfo);
+        }
+        
+        public virtual void ScenarioCleanup()
+        {
+            testRunner.CollectScenarioErrors();
+        }
+        
+        [NUnit.Framework.TestAttribute()]
+        [NUnit.Framework.DescriptionAttribute("A simple plain text using all letters from the alphabet")]
+        public virtual void ASimplePlainTextUsingAllLettersFromTheAlphabet()
+        {
+            TechTalk.SpecFlow.ScenarioInfo scenarioInfo = new TechTalk.SpecFlow.ScenarioInfo("A simple plain text using all letters from the alphabet", ((string[])(null)));
+#line 9
+this.ScenarioSetup(scenarioInfo);
+#line hidden
+#line 10
+ testRunner.Given("the plain text", "the quick brown fox jumps over the lazy dog", ((TechTalk.SpecFlow.Table)(null)), "Given ");
+#line hidden
+            TechTalk.SpecFlow.Table table1 = new TechTalk.SpecFlow.Table(new string[] {
+                        "Plain text letter",
+                        "Cypher text letter"});
+            table1.AddRow(new string[] {
+                        "A",
+                        "B"});
+            table1.AddRow(new string[] {
+                        "B",
+                        "C"});
+            table1.AddRow(new string[] {
+                        "C",
+                        "D"});
+            table1.AddRow(new string[] {
+                        "D",
+                        "E"});
+            table1.AddRow(new string[] {
+                        "E",
+                        "F"});
+            table1.AddRow(new string[] {
+                        "F",
+                        "G"});
+            table1.AddRow(new string[] {
+                        "G",
+                        "H"});
+            table1.AddRow(new string[] {
+                        "H",
+                        "I"});
+            table1.AddRow(new string[] {
+                        "I",
+                        "J"});
+            table1.AddRow(new string[] {
+                        "J",
+                        "K"});
+            table1.AddRow(new string[] {
+                        "K",
+                        "L"});
+            table1.AddRow(new string[] {
+                        "L",
+                        "M"});
+            table1.AddRow(new string[] {
+                        "M",
+                        "N"});
+            table1.AddRow(new string[] {
+                        "N",
+                        "O"});
+            table1.AddRow(new string[] {
+                        "O",
+                        "P"});
+            table1.AddRow(new string[] {
+                        "P",
+                        "Q"});
+            table1.AddRow(new string[] {
+                        "Q",
+                        "R"});
+            table1.AddRow(new string[] {
+                        "R",
+                        "S"});
+            table1.AddRow(new string[] {
+                        "S",
+                        "T"});
+            table1.AddRow(new string[] {
+                        "T",
+                        "U"});
+            table1.AddRow(new string[] {
+                        "U",
+                        "V"});
+            table1.AddRow(new string[] {
+                        "V",
+                        "W"});
+            table1.AddRow(new string[] {
+                        "W",
+                        "X"});
+            table1.AddRow(new string[] {
+                        "X",
+                        "Y"});
+            table1.AddRow(new string[] {
+                        "Y",
+                        "Z"});
+            table1.AddRow(new string[] {
+                        "Z",
+                        "A"});
+#line 14
+ testRunner.When("I encrypt the text using the following letter substitution", ((string)(null)), table1, "When ");
+#line hidden
+#line 42
+ testRunner.Then("the cypher text should be", "UIF RVJDL CSPXO GPY KVNQT PWFS UIF MBAZ EPH", ((TechTalk.SpecFlow.Table)(null)), "Then ");
+#line hidden
+            this.ScenarioCleanup();
+        }
+    }
+}
+#pragma warning restore
+#endregion
diff --git a/Cypher.Tests/EncryptPlainTextSteps.cs b/Cypher.Tests/EncryptPlainTextSteps.cs
new file mode 100644
index 0000000..64c21b7
--- /dev/null
+++ b/Cypher.Tests/EncryptPlainTextSteps.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using TechTalk.SpecFlow;
+
+namespace Cypher.Tests
+{
+    [Binding]
+    public class EncryptPlainTextSteps
+    {
+        private string _plainText;
+        private string _encryptedText;
+
+        [Given(@"the plain text")]
+        public void GivenThePlainText(string plainText)
+        {
+            _plainText = plainText;
+        }
+
+        [When(@"I encrypt the text using the following letter substitution")]
+        public void WhenIEncryptTheTextUsingTheFollowingLetterSubstitution(Table table)
+        {
+            var cypher = new SubstitutionCypher();
+
+            foreach (var tableRow in table.Rows)
+            {
+                cypher.Substitute(tableRow[0]).For(tableRow[1]);
+            }
+
+            _encryptedText = cypher.Encrypt(_plainText);
+        }
+        
+        [Then(@"the cypher text should be")]
+        public void ThenTheCypherTextShouldBe(string expectedCypherText)
+        {
+            _encryptedText.Should().Be(expectedCypherText);
+        }
+    }
+
+    public class SubstitutionCypher
+    {
+        private readonly List<Substitution> _substitutionList;
+
+        public SubstitutionCypher()
+        {
+            _substitutionList = new List<Substitution>();
+        }
+
+        public Substitution Substitute(string letterToSubstitute)
+        {
+            var substitution = new Substitution(letterToSubstitute.ToUpper());
+
+            _substitutionList.Add(substitution);
+
+            return substitution;
+        }
+
+        public string Encrypt(string plainText)
+        {
+            var encryptedText = "";
+            foreach (var letter in plainText.ToUpper())
+            {
+                var substitution = _substitutionList.SingleOrDefault(
+                    s => s.LetterToSubstitute.Equals(letter.ToString(), StringComparison.OrdinalIgnoreCase));
+
+                if (substitution != null)
+                {
+                    encryptedText += substitution.LetterToSubstituteWith;
+                }
+                else
+                {
+                    encryptedText += letter;
+                }
+            }
+
+            return encryptedText;
+        }
+    }
+
+    public static class SubstitutionExtensionMethods
+    {
+        public static void For(this Substitution substitution, string letterToSubstituteWith)
+        {
+            substitution.LetterToSubstituteWith = letterToSubstituteWith.ToUpper();
+        }
+    }
+
+    public class Substitution
+    {
+        public string LetterToSubstitute { get; }
+        public string LetterToSubstituteWith { get; set; }
+
+        public Substitution(string letterToSubstitute)
+        {
+            LetterToSubstitute = letterToSubstitute;
+        }
+    }
+}
diff --git a/Cypher.Tests/app.config b/Cypher.Tests/app.config
index d385758..7208a30 100644
--- a/Cypher.Tests/app.config
+++ b/Cypher.Tests/app.config
@@ -3,24 +3,10 @@
   <configSections>
     <section name="specFlow" type="TechTalk.SpecFlow.Configuration.ConfigurationSectionHandler, TechTalk.SpecFlow" />
   </configSections>
-  <specFlow>
-    <!-- Possible values include NUnit (default), MsTest, xUnit -->
-    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config --><unitTestProvider name="NUnit" />
-    
-    <!-- Other SpecFlow Configuration options. For additional details on the options specified here, 
-      see http://cloud.github.com/downloads/techtalk/SpecFlow/SpecFlow%20Guide.pdf
-    <language feature="en-US" tool="" />
-    
-    <generator allowDebugGeneratedFiles="false" />
-    
-    <runtime detectAmbiguousMatches="true"
-      stopAtFirstError="false"
-      missingOrPendingStepsOutcome="Inconclusive" />
-    
-    <trace traceSuccessfulSteps="true"
-      traceTimings="false"
-      minTracedDuration="0:0:0.1"
-      listener="TechTalk.SpecFlow.Tracing.DefaultListener,TechTalk.SpecFlow" />
-    -->
-  </specFlow>
-</configuration>
\ No newline at end of file
+  
+  
+<specFlow>
+    <!-- For additional details on SpecFlow configuration options see http://go.specflow.org/doc-config -->
+  <unitTestProvider name="NUnit" />
+
+</specFlow></configuration>
\ No newline at end of file
diff --git a/Cypher.Tests/packages.config b/Cypher.Tests/packages.config
index 4dddd05..fab78f6 100644
--- a/Cypher.Tests/packages.config
+++ b/Cypher.Tests/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentAssertions" version="4.0.0" targetFramework="net452" />
   <package id="NUnit" version="2.6.4" targetFramework="net452" />
-  <package id="SpecFlow" version="1.4.0" targetFramework="net452" />
-  <package id="SpecFlow.NUnit" version="1.1.1" targetFramework="net452" />
+  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net452" />
+  <package id="SpecFlow" version="1.9.0" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/Cypher.v2.ncrunchsolution b/Cypher.v2.ncrunchsolution
new file mode 100644
index 0000000..f7414fb
Binary files /dev/null and b/Cypher.v2.ncrunchsolution differ
diff --git a/Cypher/Cypher.csproj b/Cypher/Cypher.csproj
index 4dcc865..6243a3e 100644
--- a/Cypher/Cypher.csproj
+++ b/Cypher/Cypher.csproj
@@ -33,18 +33,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.0.0\lib\net45\FluentAssertions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\packages\FluentAssertions.4.0.0\lib\net45\FluentAssertions.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -60,7 +48,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Cypher/Cypher.v2.ncrunchproject b/Cypher/Cypher.v2.ncrunchproject
new file mode 100644
index 0000000..cdfbdeb
Binary files /dev/null and b/Cypher/Cypher.v2.ncrunchproject differ
diff --git a/Cypher/packages.config b/Cypher/packages.config
deleted file mode 100644
index ba1e2f8..0000000
--- a/Cypher/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="FluentAssertions" version="4.0.0" targetFramework="net452" />
-  <package id="NUnit" version="2.6.4" targetFramework="net452" />
-</packages>
\ No newline at end of file