Index: trunk/ippdb/tests/alloc.c
===================================================================
--- trunk/ippdb/tests/alloc.c	(revision 8007)
+++ trunk/ippdb/tests/alloc.c	(revision 8021)
@@ -384,5 +384,5 @@
         pzPendingImfileRow *object;
 
-        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string", "a string"    );
+        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string"    );
 
         if (!object) {
@@ -402,8 +402,4 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
         if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
@@ -454,15 +450,11 @@
         newImfileRow    *object;
 
-        object = newImfileRowAlloc("a string", "a string", "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) {
+        object = newImfileRowAlloc("a string", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/insert.c
===================================================================
--- trunk/ippdb/tests/insert.c	(revision 8007)
+++ trunk/ippdb/tests/insert.c	(revision 8021)
@@ -163,5 +163,5 @@
         }
 
-        if (!pzPendingImfileInsert(dbh, "a string", -32, "a string", "a string", "a string", "a string")) {
+        if (!pzPendingImfileInsert(dbh, "a string", -32, "a string", "a string", "a string")) {
             exit(EXIT_FAILURE);
         }
@@ -193,5 +193,5 @@
         }
 
-        if (!newImfileInsert(dbh, "a string", "a string", "a string", "a string")) {
+        if (!newImfileInsert(dbh, "a string", "a string", "a string")) {
             exit(EXIT_FAILURE);
         }
Index: trunk/ippdb/tests/insertobject.c
===================================================================
--- trunk/ippdb/tests/insertobject.c	(revision 8007)
+++ trunk/ippdb/tests/insertobject.c	(revision 8021)
@@ -234,5 +234,5 @@
         }
 
-        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string", "a string");
+        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
@@ -278,5 +278,5 @@
         }
 
-        object = newImfileRowAlloc("a string", "a string", "a string", "a string");
+        object = newImfileRowAlloc("a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/metadatafromobject.c
===================================================================
--- trunk/ippdb/tests/metadatafromobject.c	(revision 8007)
+++ trunk/ippdb/tests/metadatafromobject.c	(revision 8021)
@@ -467,5 +467,5 @@
         bool            status;
 
-        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string", "a string");
+        object = pzPendingImfileRowAlloc("a string", -32, "a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
@@ -491,8 +491,4 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
         if (strncmp(psMetadataLookupPtr(&status, md, "class_id"), "a string", MAX_STRING_LENGTH)) {
             psFree(md);
@@ -553,5 +549,5 @@
         bool            status;
 
-        object = newImfileRowAlloc("a string", "a string", "a string", "a string");
+        object = newImfileRowAlloc("a string", "a string", "a string");
         if (!object) {
             exit(EXIT_FAILURE);
@@ -566,8 +562,4 @@
 
         if (strncmp(psMetadataLookupPtr(&status, md, "exp_id"), "a string", MAX_STRING_LENGTH)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(psMetadataLookupPtr(&status, md, "class"), "a string", MAX_STRING_LENGTH)) {
             psFree(md);
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- trunk/ippdb/tests/objectfrommetadata.c	(revision 8007)
+++ trunk/ippdb/tests/objectfrommetadata.c	(revision 8021)
@@ -693,8 +693,4 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
         if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) {
             psFree(md);
@@ -726,8 +722,4 @@
             exit(EXIT_FAILURE);
         }
-        if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
         if (strncmp(object->class_id, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
@@ -809,8 +801,4 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAddStr(md, PS_LIST_TAIL, "class", 0, NULL, "a string")) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
         if (!psMetadataAddStr(md, PS_LIST_TAIL, "class_id", 0, NULL, "a string")) {
             psFree(md);
@@ -831,8 +819,4 @@
 
         if (strncmp(object->exp_id, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->class, "a string", MAX_STRING_LENGTH)) {
             psFree(object);
             exit(EXIT_FAILURE);
Index: trunk/ippdb/tests/pop.c
===================================================================
--- trunk/ippdb/tests/pop.c	(revision 8007)
+++ trunk/ippdb/tests/pop.c	(revision 8021)
@@ -221,14 +221,13 @@
         psS32           bytes;
         char            md5sum[256];
-        char            class[256];
-        char            class_id[256];
-        char            uri[256];
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!pzPendingImfilePop(dbh, (char **)&exp_id, &bytes, (char **)&md5sum, (char **)&class, (char **)&class_id, (char **)&uri)) { 
+        char            class_id[256];
+        char            uri[256];
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!pzPendingImfilePop(dbh, (char **)&exp_id, &bytes, (char **)&md5sum, (char **)&class_id, (char **)&uri)) { 
             exit(EXIT_FAILURE);
         }
@@ -260,14 +259,13 @@
         psDB            *dbh;
         char            exp_id[256];
-        char            class[256];
-        char            class_id[256];
-        char            uri[256];
-
-        dbh = psDBInit("localhost", "test", NULL, "test");
-        if (!dbh) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!newImfilePop(dbh, (char **)&exp_id, (char **)&class, (char **)&class_id, (char **)&uri)) { 
+        char            class_id[256];
+        char            uri[256];
+
+        dbh = psDBInit("localhost", "test", NULL, "test");
+        if (!dbh) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!newImfilePop(dbh, (char **)&exp_id, (char **)&class_id, (char **)&uri)) { 
             exit(EXIT_FAILURE);
         }