pythonnet · lostmsu · Sep 30, 2021 · Sep 15, 2021
diff --git a/src/embed_tests/TestConverter.cs b/src/embed_tests/TestConverter.cs
@@ -94,7 +94,7 @@ public void CovertTypeError()
         [Test]
         public void ConvertOverflow()
         {
-            using (var num = new PyLong(ulong.MaxValue))
+            using (var num = new PyInt(ulong.MaxValue))
             {
                 IntPtr largeNum = PyRuntime.PyNumber_Add(num.Handle, num.Handle);
                 try

diff --git a/src/embed_tests/TestFinalizer.cs b/src/embed_tests/TestFinalizer.cs
@@ -50,7 +50,7 @@ public void CollectBasicObject()
             };
 
             Assert.IsFalse(called, "The event handler was called before it was installed");
-            Finalizer.Instance.CollectOnce += handler;
+            Finalizer.Instance.BeforeCollect += handler;
 
             IntPtr pyObj = MakeAGarbage(out var shortWeak, out var longWeak);
             FullGCCollect();
@@ -81,7 +81,7 @@ public void CollectBasicObject()
             }
             finally
             {
-                Finalizer.Instance.CollectOnce -= handler;
+                Finalizer.Instance.BeforeCollect -= handler;
             }
             Assert.IsTrue(called, "The event handler was not called during finalization");
             Assert.GreaterOrEqual(objectCount, 1);
@@ -121,7 +121,7 @@ private static IntPtr MakeAGarbage(out WeakReference shortWeak, out WeakReferenc
             IntPtr handle = IntPtr.Zero;
             WeakReference @short = null, @long = null;
             // must create Python object in the thread where we have GIL
-            IntPtr val = PyLong.FromLong(1024);
+            IntPtr val = Runtime.Runtime.PyLong_FromLongLong(1024).DangerousMoveToPointerOrNull();
             // must create temp object in a different thread to ensure it is not present
             // when conservatively scanning stack for GC roots.
             // see https://xamarin.github.io/bugzilla-archives/17/17593/bug.html
@@ -234,7 +234,7 @@ private static IntPtr CreateStringGarbage()
         {
             PyString s1 = new PyString("test_string");
             // s2 steal a reference from s1
-            PyString s2 = new PyString(s1.Handle);
+            PyString s2 = new PyString(StolenReference.DangerousFromPointer(s1.Handle));
             return s1.Handle;
         }
     }

diff --git a/src/embed_tests/TestPyAnsiString.cs b/src/embed_tests/TestPyAnsiString.cs
diff --git a/src/embed_tests/TestPyFloat.cs b/src/embed_tests/TestPyFloat.cs
@@ -21,15 +21,6 @@ public void Dispose()
             PythonEngine.Shutdown();
         }
 
-        [Test]
-        public void IntPtrCtor()
-        {
-            var i = new PyFloat(1);
-            Runtime.Runtime.XIncref(i.Handle);
-            var ii = new PyFloat(i.Handle);
-            Assert.AreEqual(i.Handle, ii.Handle);
-        }
-
         [Test]
         public void FloatCtor()
         {

diff --git a/src/embed_tests/TestPyInt.cs b/src/embed_tests/TestPyInt.cs
@@ -82,15 +82,6 @@ public void TestCtorSByte()
             Assert.AreEqual(i, a.ToInt32());
         }
 
-        [Test]
-        public void TestCtorPtr()
-        {
-            var i = new PyInt(5);
-            Runtime.Runtime.XIncref(i.Handle);
-            var a = new PyInt(i.Handle);
-            Assert.AreEqual(5, a.ToInt32());
-        }
-
         [Test]
         public void TestCtorPyObject()
         {
@@ -184,9 +175,10 @@ public void TestConvertToInt16()
         [Test]
         public void TestConvertToInt64()
         {
-            var a = new PyInt(5);
+            long val = 5 + (long)int.MaxValue;
+            var a = new PyInt(val);
             Assert.IsInstanceOf(typeof(long), a.ToInt64());
-            Assert.AreEqual(5, a.ToInt64());
+            Assert.AreEqual(val, a.ToInt64());
         }
     }
 }
diff --git a/src/embed_tests/TestPyLong.cs b/src/embed_tests/TestPyLong.cs