Index: trunk/ippdb/tests/alloc.c
===================================================================
--- trunk/ippdb/tests/alloc.c	(revision 11873)
+++ trunk/ippdb/tests/alloc.c	(revision 11988)
@@ -1562,7 +1562,7 @@
 
     {
-        p4ScfileRow     *object;
-
-        object = p4ScfileRowAlloc(-32, "a string", "a string", "a string", -32, "a string", 64.64, 64.64    );
+        p4SkyfileRow    *object;
+
+        object = p4SkyfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64    );
 
         if (!object) {
@@ -1582,12 +1582,4 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p3_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
         if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
@@ -1609,5 +1601,5 @@
         p5RunRow        *object;
 
-        object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z"    );
+        object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"    );
 
         if (!object) {
@@ -1634,12 +1626,20 @@
             exit(EXIT_FAILURE);
         }
-
-        psFree(object);
-    }
-
-    {
-        p5InputScfileRow *object;
-
-        object = p5InputScfileRowAlloc(-32, -32, "a string", "a string", "a string", true    );
+        if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+    }
+
+    {
+        p5InputSkyfileRow *object;
+
+        object = p5InputSkyfileRowAlloc(-32, -32, "a string", "a string", "a string", true    );
 
         if (!object) {
@@ -1676,7 +1676,7 @@
 
     {
-        p5DiffScfileRow *object;
-
-        object = p5DiffScfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64    );
+        p5DiffSkyfileRow *object;
+
+        object = p5DiffSkyfileRowAlloc(-32, "a string", 64.64, 64.64    );
 
         if (!object) {
@@ -1688,4 +1688,48 @@
             exit(EXIT_FAILURE);
         }
+        if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->bg == 64.64) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->bg_mean_stdev == 64.64) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+    }
+
+    {
+        p6RunRow        *object;
+
+        object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->p6_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
         if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
@@ -1696,24 +1740,12 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->uri, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->bg == 64.64) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->bg_mean_stdev == 64.64) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-    }
-
-    {
-        p6RunRow        *object;
-
-        object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z"    );
+
+        psFree(object);
+    }
+
+    {
+        p6InputSkyfileRow *object;
+
+        object = p6InputSkyfileRowAlloc(-32, -32    );
 
         if (!object) {
@@ -1725,27 +1757,16 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->state, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->workdir, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->dvodb, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-    }
-
-    {
-        p6InputScfileRow *object;
-
-        object = p6InputScfileRowAlloc(-32, -32, "a string", "a string"    );
+        if (!object->p4_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+    }
+
+    {
+        p6SumSkyfileRow *object;
+
+        object = p6SumSkyfileRowAlloc(-32, "a string", 64.64, 64.64    );
 
         if (!object) {
@@ -1754,41 +1775,4 @@
 
         if (!object->p6_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p4_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-    }
-
-    {
-        p6SumScfileRow  *object;
-
-        object = p6SumScfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p6_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->skycell_id, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->tess_id, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);