Index: trunk/ippdb/tests/alloc.c
===================================================================
--- trunk/ippdb/tests/alloc.c	(revision 10989)
+++ trunk/ippdb/tests/alloc.c	(revision 11005)
@@ -608,5 +608,5 @@
         p2PendingExpRow *object;
 
-        object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string"    );
+        object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string", -16    );
 
         if (!object) {
@@ -634,4 +634,7 @@
             exit(EXIT_FAILURE);
         }
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
 
         psFree(object);
@@ -641,5 +644,5 @@
         p2PendingImfileRow *object;
 
-        object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", -32, -32    );
+        object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", -32, -32, -16    );
 
         if (!object) {
@@ -668,4 +671,7 @@
         }
         if (!object->p2_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
             psFree(object);
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/insert.c
===================================================================
--- trunk/ippdb/tests/insert.c	(revision 10989)
+++ trunk/ippdb/tests/insert.c	(revision 11005)
@@ -208,20 +208,20 @@
         }
 
-        if (!p2PendingExpInsert(dbh, "a string", "a string", -32, -32, "a string")) {
-            exit(EXIT_FAILURE);
-        }
-
-        psDBCleanup(dbh);
-    }
-
-    {
-        psDB            *dbh;
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!p2PendingImfileInsert(dbh, "a string", "a string", "a string", "a string", -32, -32)) {
+        if (!p2PendingExpInsert(dbh, "a string", "a string", -32, -32, "a string", -16)) {
+            exit(EXIT_FAILURE);
+        }
+
+        psDBCleanup(dbh);
+    }
+
+    {
+        psDB            *dbh;
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!p2PendingImfileInsert(dbh, "a string", "a string", "a string", "a string", -32, -32, -16)) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/insertobject.c
===================================================================
--- trunk/ippdb/tests/insertobject.c	(revision 10989)
+++ trunk/ippdb/tests/insertobject.c	(revision 11005)
@@ -300,5 +300,5 @@
         }
 
-        object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string");
+        object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string", -16);
         if (!object) {
             exit(EXIT_FAILURE);
@@ -322,5 +322,5 @@
         }
 
-        object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", -32, -32);
+        object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", -32, -32, -16);
         if (!object) {
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/metadatafromobject.c
===================================================================
--- trunk/ippdb/tests/metadatafromobject.c	(revision 10989)
+++ trunk/ippdb/tests/metadatafromobject.c	(revision 11005)
@@ -714,5 +714,5 @@
         bool            status;
 
-        object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string");
+        object = p2PendingExpRowAlloc("a string", "a string", -32, -32, "a string", -16);
         if (!object) {
             exit(EXIT_FAILURE);
@@ -746,4 +746,7 @@
             exit(EXIT_FAILURE);
         }
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
 
         psFree(md);
@@ -755,5 +758,5 @@
         bool            status;
 
-        object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", -32, -32);
+        object = p2PendingImfileRowAlloc("a string", "a string", "a string", "a string", -32, -32, -16);
         if (!object) {
             exit(EXIT_FAILURE);
@@ -788,4 +791,7 @@
         }
         if (!psMetadataLookupS32(&status, md, "p2_version") == -32) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
             psFree(md);
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- trunk/ippdb/tests/objectfrommetadata.c	(revision 10989)
+++ trunk/ippdb/tests/objectfrommetadata.c	(revision 11005)
@@ -1123,4 +1123,7 @@
             exit(EXIT_FAILURE);
         }
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
 
         object = p2PendingExpObjectFromMetadata(md);
@@ -1152,4 +1155,7 @@
             exit(EXIT_FAILURE);
         }
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
 
         psFree(object);
@@ -1185,4 +1191,7 @@
             exit(EXIT_FAILURE);
         }
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
 
         object = p2PendingImfileObjectFromMetadata(md);
@@ -1215,4 +1224,7 @@
         }
         if (!object->p2_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
             psFree(object);
             exit(EXIT_FAILURE);