@@ -80,16 +80,16 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="pyinitialize.cs" />
     <Compile Include="dynamic.cs" />
     <Compile Include="pyimport.cs" />
-    <Compile Include="pyiter.cs" />
-    <Compile Include="pylong.cs" />
-    <Compile Include="pyobject.cs" />
+    <Compile Include="pyinitialize.cs" />
     <Compile Include="pyrunstring.cs" />
-    <Compile Include="pythonexception.cs" />
-    <Compile Include="pytuple.cs" />
+    <Compile Include="TestPyList.cs" />
+    <Compile Include="TestPyLong.cs" />
+    <Compile Include="TestPyString.cs" />
+    <Compile Include="TestPythonException.cs" />
     <Compile Include="TestPythonEngineProperties.cs" />
+    <Compile Include="TestPyTuple.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\runtime\Python.Runtime.csproj">
 
@@ -5,7 +5,7 @@
 
 namespace Python.EmbeddingTest
 {
-    public class PyIterTest
+    public class TestPyList
     {
         [Test]
         public void TestOnPyList()
 
@@ -4,7 +4,7 @@
 
 namespace Python.EmbeddingTest
 {
-    public class PyLongTest
+    public class TestPyLong
     {
         [Test]
         public void TestToInt64()
 
@@ -4,7 +4,7 @@
 
 namespace Python.EmbeddingTest
 {
-    public class PyObjectTest
+    public class TestPyString
     {
         [Test]
         public void TestUnicode()
 
@@ -4,7 +4,7 @@
 
 namespace Python.EmbeddingTest
 {
-    public class PyTupleTest
+    public class TestPyTuple
     {
         /// <summary>
         /// Test IsTupleType without having to Initialize a tuple.
 
@@ -11,7 +11,7 @@ namespace Python.EmbeddingTest
     /// Keeping this in the old-style SetUp/TearDown
     /// to ensure that setup still works.
     /// </remarks>
-    public class PythonExceptionTest
+    public class TestPythonException
     {
         private IntPtr gs;
Original file line number	Diff line number	Diff line change
@@ -5,7 +5,7 @@
5	5
6	6	namespace Python.EmbeddingTest
7	7	{
8		- public class PyIterTest
	8	+ public class TestPyList
9	9	{
10	10	[Test]
11	11	public void TestOnPyList()
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@
4	4
5	5	namespace Python.EmbeddingTest
6	6	{
7		- public class PyLongTest
	7	+ public class TestPyLong
8	8	{
9	9	[Test]
10	10	public void TestToInt64()
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@
4	4
5	5	namespace Python.EmbeddingTest
6	6	{
7		- public class PyObjectTest
	7	+ public class TestPyString
8	8	{
9	9	[Test]
10	10	public void TestUnicode()
Original file line number	Diff line number	Diff line change
@@ -4,7 +4,7 @@
4	4
5	5	namespace Python.EmbeddingTest
6	6	{
7		- public class PyTupleTest
	7	+ public class TestPyTuple
8	8	{
9	9	/// <summary>
10	10	/// Test IsTupleType without having to Initialize a tuple.
Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@ namespace Python.EmbeddingTest
11	11	/// Keeping this in the old-style SetUp/TearDown
12	12	/// to ensure that setup still works.
13	13	/// </remarks>
14		- public class PythonExceptionTest
	14	+ public class TestPythonException
15	15	{
16	16	private IntPtr gs;
17	17