diff --git a/Local.testsettings b/Local.testsettings
deleted file mode 100644
index f289054..0000000
--- a/Local.testsettings
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestSettings name="Local" id="e94baad6-3eb3-4263-9119-9d52054425a8" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
-  <Description>Il s'agit des paramètres de test par défaut pour une série de tests locale.</Description>
-  <Deployment enabled="false" />
-  <Execution>
-    <TestTypeSpecific />
-    <AgentRule name="Execution Agents">
-    </AgentRule>
-  </Execution>
-</TestSettings>
\ No newline at end of file
diff --git a/TraceAndTestImpact.testsettings b/TraceAndTestImpact.testsettings
deleted file mode 100644
index f7c6fcc..0000000
--- a/TraceAndTestImpact.testsettings
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestSettings name="Trace et impact de test" id="4ea1a2c1-1cee-4862-a218-6c38c632b9cc" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
-  <Description>Il s'agit des paramètres de test pour trace et impact de test.</Description>
-  <Execution>
-    <TestTypeSpecific />
-    <AgentRule name="Execution Agents">
-      <DataCollectors>
-        <DataCollector uri="datacollector://microsoft/SystemInfo/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo.SystemInfoDataCollector, Microsoft.VisualStudio.TestTools.DataCollection.SystemInfo, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Informations système">
-        </DataCollector>
-        <DataCollector uri="datacollector://microsoft/ActionLog/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TestTools.ManualTest.ActionLog.ActionLogPlugin, Microsoft.VisualStudio.TestTools.ManualTest.ActionLog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Actions">
-        </DataCollector>
-        <DataCollector uri="datacollector://microsoft/HttpProxy/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.HttpProxyCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Proxy client ASP.NET pour IntelliTrace et l'impact de test">
-        </DataCollector>
-        <DataCollector uri="datacollector://microsoft/TestImpact/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TestImpactDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="Impact de test">
-        </DataCollector>
-        <DataCollector uri="datacollector://microsoft/TraceDebugger/1.0" assemblyQualifiedName="Microsoft.VisualStudio.TraceCollector.TraceDebuggerDataCollector, Microsoft.VisualStudio.TraceCollector, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" friendlyName="IntelliTrace">
-        </DataCollector>
-      </DataCollectors>
-    </AgentRule>
-  </Execution>
-</TestSettings>
\ No newline at end of file
diff --git a/vCardEditor.sln b/vCardEditor.sln
index b0e3e9b..2b5dc03 100644
--- a/vCardEditor.sln
+++ b/vCardEditor.sln
@@ -3,16 +3,38 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vCardEditor", "vCardEditor\vCardEditor.csproj", "{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vCardEditor_Test", "vCardEditor_Test\vCardEditor_Test.csproj", "{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Debug|x86.ActiveCfg = Debug|x86
 		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Debug|x86.Build.0 = Debug|x86
+		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Release|Any CPU.ActiveCfg = Release|x86
+		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Release|Mixed Platforms.Build.0 = Release|x86
 		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Release|x86.ActiveCfg = Release|x86
 		{A0D2ACEB-1BCC-4E7F-9E7D-2BE25A7ABE22}.Release|x86.Build.0 = Release|x86
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{76D5F727-2E1A-46B5-BD35-F8F9B5881FEE}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/vCardEditor.vsmdi b/vCardEditor.vsmdi
deleted file mode 100644
index f8fdd43..0000000
--- a/vCardEditor.vsmdi
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
-  <TestList name="Listes de tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
-    <RunConfiguration id="e94baad6-3eb3-4263-9119-9d52054425a8" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  </TestList>
-</TestLists>
\ No newline at end of file
diff --git a/vCardEditor_Test/vCardEditor_Test.csproj b/vCardEditor_Test/vCardEditor_Test.csproj
index e689f87..dd5cb76 100644
--- a/vCardEditor_Test/vCardEditor_Test.csproj
+++ b/vCardEditor_Test/vCardEditor_Test.csproj
@@ -33,6 +33,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -44,6 +45,7 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MainPresenterTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />