diff --git a/ParrotSharp.csproj b/ParrotSharp.csproj
index 0ff22fd..d69437a 100644
--- a/ParrotSharp.csproj
+++ b/ParrotSharp.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,6 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Parrot</RootNamespace>
     <AssemblyName>ParrotSharp</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -56,7 +55,6 @@
     <Compile Include="src\Pmc\String.cs" />
     <Compile Include="src\Pmc\Integer.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildBinPath)\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.
@@ -68,4 +66,9 @@
   <ItemGroup>
     <Folder Include="src\Pmc\" />
   </ItemGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties InternalTargetFrameworkVersion="3.5" />
+    </MonoDevelop>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/ParrotSharp.sln b/ParrotSharp.sln
index 629e7ac..3e2457b 100644
--- a/ParrotSharp.sln
+++ b/ParrotSharp.sln
@@ -1,9 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParrotSharp", "ParrotSharp.csproj", "{AAED9261-C134-4905-88E6-197FBEA661F8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParrotTest", "ParrotTest\ParrotTest.csproj", "{D5EE4663-DB60-4B96-825A-D05842A9F8D0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParrotSharpTest", "ParrotSharpTest\ParrotSharpTest.csproj", "{F90A2E1A-B062-4BFC-B4FF-7E09A2CB73F0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,10 +15,10 @@ Global
 		{AAED9261-C134-4905-88E6-197FBEA661F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AAED9261-C134-4905-88E6-197FBEA661F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AAED9261-C134-4905-88E6-197FBEA661F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5EE4663-DB60-4B96-825A-D05842A9F8D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5EE4663-DB60-4B96-825A-D05842A9F8D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5EE4663-DB60-4B96-825A-D05842A9F8D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5EE4663-DB60-4B96-825A-D05842A9F8D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F90A2E1A-B062-4BFC-B4FF-7E09A2CB73F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F90A2E1A-B062-4BFC-B4FF-7E09A2CB73F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F90A2E1A-B062-4BFC-B4FF-7E09A2CB73F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F90A2E1A-B062-4BFC-B4FF-7E09A2CB73F0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = ParrotSharp.csproj
diff --git a/ParrotSharpTest/PMC_Test.cs b/ParrotSharpTest/PMC_Test.cs
new file mode 100644
index 0000000..4b85f35
--- /dev/null
+++ b/ParrotSharpTest/PMC_Test.cs
@@ -0,0 +1,38 @@
+using NUnit.Framework;
+using ParrotSharp;
+using ParrotSharp.Pmc;
+using System;
+
+namespace ParrotSharpTest
+{
+	[TestFixture()]  
+	public class PMC_Test {
+		
+		[Test()]
+		public void BoxString() {			
+			string exename = AppDomain.CurrentDomain.FriendlyName;
+			Parrot parrot = new Parrot(Parrot_Test.ParentInterpreter, exename);
+			
+			Parrot_PMC box = "This is a parrot string".ToParrotStringPMC(parrot);
+			Assert.AreEqual("This is a parrot string", box.ToString(), "Can't box string into a PMC");
+		}
+		
+		[Test()]
+		public void InvokeMethod() {
+			string exename = AppDomain.CurrentDomain.FriendlyName;
+			Parrot parrot = new Parrot(Parrot_Test.ParentInterpreter, exename);
+			
+			Parrot_PMC pmc_string = "This is a parrot string".ToParrotStringPMC(parrot);
+			IPMCFactory<CallContext> sign_factory = CallContext.GetFactory(parrot);
+			CallContext sign = sign_factory.Instance();
+			sign.Signature = "PiSS->".ToParrotString(parrot);
+			sign.AddArgument(pmc_string);
+			sign.AddArgument("string".ToParrotStringPMC(parrot));
+			sign.AddArgument("pmc".ToParrotStringPMC(parrot));
+			
+			pmc_string.InvokeMethod("replace".ToParrotString(parrot), sign);
+			Assert.AreEqual("This is a parrot pmc", pmc_string.ToString(), "Error when invoking a method");
+		}
+		
+	}	
+}
diff --git a/ParrotTest/ParrotTest.csproj b/ParrotSharpTest/ParrotSharpTest.csproj
similarity index 70%
rename from ParrotTest/ParrotTest.csproj
rename to ParrotSharpTest/ParrotSharpTest.csproj
index a2ad815..effa171 100644
--- a/ParrotTest/ParrotTest.csproj
+++ b/ParrotSharpTest/ParrotSharpTest.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
+    <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D5EE4663-DB60-4B96-825A-D05842A9F8D0}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ParrotTest</RootNamespace>
-    <AssemblyName>ParrotTest</AssemblyName>
+    <ProjectGuid>{F90A2E1A-B062-4BFC-B4FF-7E09A2CB73F0}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>ParrotSharpTest</RootNamespace>
+    <AssemblyName>ParrotSharpTest</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -18,8 +18,6 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -27,16 +25,20 @@
     <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Externalconsole>true</Externalconsole>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="nunit.core, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <Package>mono-nunit</Package>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+      <Package>mono-nunit</Package>
+    </Reference>
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="PMC_Test.cs" />
+    <Compile Include="Parrot_Test.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ParrotSharp.csproj">
diff --git a/ParrotSharpTest/Parrot_Test.cs b/ParrotSharpTest/Parrot_Test.cs
new file mode 100644
index 0000000..b2d8d22
--- /dev/null
+++ b/ParrotSharpTest/Parrot_Test.cs
@@ -0,0 +1,31 @@
+using NUnit.Framework;
+using ParrotSharp;
+using ParrotSharp.Pmc;
+using System;
+
+namespace ParrotSharpTest
+{
+	[TestFixture()]  
+	public class Parrot_Test {
+		
+		static private Parrot ParrotParent = null;
+		
+		static public Parrot ParentInterpreter {
+			get {
+				if(ParrotParent != null) return ParrotParent;
+				else {
+					ParrotParent = new Parrot();
+					return ParrotParent;
+				}
+			}
+		}
+		
+		[Test()]
+		public void CreateParrot() {
+			string exename = AppDomain.CurrentDomain.FriendlyName;
+			Parrot parrot = new Parrot(ParentInterpreter, exename);
+			Assert.AreNotEqual(IntPtr.Zero, parrot.RawPointer, "Unable to create a new Parrot interpreter");
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/ParrotTest/AssemblyInfo.cs b/ParrotTest/AssemblyInfo.cs
deleted file mode 100644
index fd41d79..0000000
--- a/ParrotTest/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes. 
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("ParrotTest")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly, 
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/ParrotTest/Main.cs b/ParrotTest/Main.cs
deleted file mode 100644
index bd9718d..0000000
--- a/ParrotTest/Main.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using ParrotSharp;
-using ParrotSharp.Pmc;
-using System.Runtime.InteropServices;
-
-namespace ParrotTest
-{
-	class MainClass
-	{
-		public static void Main (string[] args)
-		{
-			string exename = AppDomain.CurrentDomain.FriendlyName;
-			Parrot parrot = new Parrot(exename);
-			if (args.Length <= 0) {
-				Console.WriteLine("No PBC file specified, run tests using test.pbc");
-				Test(parrot);
-				return;
-			}
-			string pbcfile = args[0];
-			string[] pbcargs = new string[args.Length - 1];
-			for (int i = 1; i < args.Length; i++)
-				pbcargs[i - 1] = args[i];
-			try {
-				Parrot_PMC pbc = parrot.LoadBytecodeFile(pbcfile);
-				Parrot_PMC mainargs = parrot.GetParrotArgArray(pbcargs);
-				
-				//Parrot_PMC mainargs = parrot.PmcNull;
-				parrot.RunBytecode(pbc, mainargs);
-			} catch (ParrotException ex) {
-				Console.WriteLine("Main: " + ex.Message + "\n" + ex.StackTrace);
-			}
-		}
-		
-		//[DllImport("parrot")]
-		//private static extern int Parrot_api_ready_bytecode(IntPtr interp_pmc, IntPtr pbc, out IntPtr main_sub);
-		
-		static private void Test(Parrot parrot)
-		{
-			try {
-				Parrot_PMC pbc = parrot.LoadBytecodeFile("test.pbc");
-				parrot.RunBytecode(pbc, parrot.PmcNull);
-				//IntPtr main_sub;
-				//Parrot_api_ready_bytecode(parrot.RawPointer, pbc.RawPointer, out main_sub);
-				Class testClass = Class.GetClassPMC(parrot, "ClassTest".ToParrotStringPMC(parrot));
-				Parrot_PMC testPmc = testClass.Instantiate();
-				CallContext sign = CallContext.GetFactory(parrot).Instance();
-				sign.Signature = "Pi->".ToParrotString(parrot);
-				sign.AddArgument(testPmc);
-				testPmc.InvokeMethod("test2".ToParrotString(parrot), sign);
-			} catch (ParrotException ex) {
-				Console.WriteLine("Test: " + ex.Message + "\n" + ex.StackTrace);
-			}
-		}
-	}
-}
-
diff --git a/ParrotTest/test.pir b/ParrotTest/test.pir
deleted file mode 100644
index 2d60837..0000000
--- a/ParrotTest/test.pir
+++ /dev/null
@@ -1,15 +0,0 @@
-.sub main :main
-  say "Hello World from PIR!"
-  $P0 = newclass['ClassTest']
-  $P1 = new[$P0]
-  $P1.'test'()
-  .end
-
-.namespace['ClassTest']
-.sub test :method
-  say "Hello World from method!"
-  .end
-
-.sub test2 :method
-  say "Hello World from a method called with ParrotSharp!"
-  .end