Index: trunk/ippdb/tests/objectfrommetadata.c
===================================================================
--- trunk/ippdb/tests/objectfrommetadata.c	(revision 14169)
+++ trunk/ippdb/tests/objectfrommetadata.c	(revision 14252)
@@ -1960,4 +1960,11 @@
             exit(EXIT_FAILURE);
         }
+        if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, true)) {
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
+            psFree(md);
+            exit(EXIT_FAILURE);
+        }
             psFree(md);
             exit(EXIT_FAILURE);
@@ -1975,8 +1982,4 @@
             exit(EXIT_FAILURE);
         }
-        if (!psMetadataAdd(md, PS_LIST_TAIL, "template", PS_DATA_BOOL, NULL, true)) {
-            psFree(md);
-            exit(EXIT_FAILURE);
-        }
 
         object = diffInputSkyfileObjectFromMetadata(md);
@@ -1991,4 +1994,11 @@
             exit(EXIT_FAILURE);
         }
+        if (!object->template == true) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
             psFree(object);
             exit(EXIT_FAILURE);
@@ -2003,8 +2013,4 @@
         }
         if (strncmp(object->kind, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->template == true) {
             psFree(object);
             exit(EXIT_FAILURE);