Index: trunk/psModules/test/concepts/tap_pmConcepts.c
===================================================================
--- trunk/psModules/test/concepts/tap_pmConcepts.c	(revision 16008)
+++ trunk/psModules/test/concepts/tap_pmConcepts.c	(revision 21223)
@@ -3,6 +3,6 @@
  *  @brief Contains the tests for pmConcepts.c:
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-02 20:49:56 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-29 20:45:54 $
 *   pmConceptSpecAlloc()
     pmConceptsList()
@@ -289,5 +289,5 @@
         psF64 tmpF64;
         psS32 tmpS32;
-        pmFPA *fpa = pmFPAAlloc(NULL);
+        pmFPA *fpa = pmFPAAlloc(NULL, NULL);
         bool rc = false;
 
Index: trunk/psModules/test/concepts/tap_pmConceptsAverage.c
===================================================================
--- trunk/psModules/test/concepts/tap_pmConceptsAverage.c	(revision 16008)
+++ trunk/psModules/test/concepts/tap_pmConceptsAverage.c	(revision 21223)
@@ -140,5 +140,5 @@
 pmFPA* generateSimpleFPA(psMetadata *camera)
 {
-    pmFPA* fpa = pmFPAAlloc(camera);
+    pmFPA* fpa = pmFPAAlloc(camera, NULL);
     fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
     fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
Index: trunk/psModules/test/concepts/tap_pmConceptsPhotcode.c
===================================================================
--- trunk/psModules/test/concepts/tap_pmConceptsPhotcode.c	(revision 16008)
+++ trunk/psModules/test/concepts/tap_pmConceptsPhotcode.c	(revision 21223)
@@ -17,37 +17,4 @@
 
 
-    // ----------------------------------------------------------------------
-    // pmConceptsPhotcodeForView() tests: NULL pmConfig input
-    // psString pmConceptsPhotcodeForView(pmConfig *config, pmFPAfile *file, const pmFPAview *view)
-    {
-        psMemId id = psMemGetId();
-        pmConfig *config =pmConfigAlloc();
-        pmFPAfile *file = pmFPAfileAlloc();
-        pmFPAview *view = pmFPAviewAlloc(32);
-        ok(NULL == pmConceptsPhotcodeForView(NULL, file, view),
-          "pmConceptsPhotcodeForView(NULL, file, view) returned NULL");
-        psFree(config);
-        psFree(file);
-        psFree(view);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
-    // pmConceptsPhotcodeForView() tests: NULL pmConfig input
-    // psString pmConceptsPhotcodeForView(pmConfig *config, pmFPAfile *file, const pmFPAview *view)
-    {
-        psMemId id = psMemGetId();
-        pmConfig *config =pmConfigAlloc();
-        pmFPAfile *file = pmFPAfileAlloc();
-        pmFPAview *view = pmFPAviewAlloc(32);
-        ok(NULL == pmConceptsPhotcodeForView(NULL, file, view),
-          "pmConceptsPhotcodeForView(NULL, file, view) returned NULL");
-        psFree(config);
-        psFree(file);
-        psFree(view);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
     // pmConceptsPhotcodeForView() tests: NULL pmFPAfile input
     // psString pmConceptsPhotcodeForView(pmConfig *config, pmFPAfile *file, const pmFPAview *view)
@@ -57,5 +24,5 @@
         pmFPAfile *file = pmFPAfileAlloc();
         pmFPAview *view = pmFPAviewAlloc(32);
-        ok(NULL == pmConceptsPhotcodeForView(config, NULL, view),
+        ok(NULL == pmConceptsPhotcodeForView(NULL, view),
           "pmConceptsPhotcodeForView(config, NULL, view) returned NULL");
         psFree(config);
@@ -73,5 +40,5 @@
         pmFPAfile *file = pmFPAfileAlloc();
         pmFPAview *view = pmFPAviewAlloc(32);
-        ok(NULL == pmConceptsPhotcodeForView(config, file, NULL),
+        ok(NULL == pmConceptsPhotcodeForView(file, NULL),
           "pmConceptsPhotcodeForView(config, file, NULL) returned NULL");
         psFree(config);
@@ -104,5 +71,5 @@
         psString goodPhotcode = pmFPAfileNameFromRule(rule, file, view);
 
-        psString testPhotcode = pmConceptsPhotcodeForView(config, file, view);
+        psString testPhotcode = pmConceptsPhotcodeForView(file, view);
         ok(testPhotcode, "pmConceptsPhotcodeForView(config, file, view) returned non-NULL");
         ok(!strcmp(goodPhotcode, testPhotcode), "pmConceptsPhotcodeForView() produced the correct string");
Index: trunk/psModules/test/concepts/tap_pmConceptsUpdate.c
===================================================================
--- trunk/psModules/test/concepts/tap_pmConceptsUpdate.c	(revision 16008)
+++ trunk/psModules/test/concepts/tap_pmConceptsUpdate.c	(revision 21223)
@@ -141,5 +141,5 @@
 pmFPA* generateSimpleFPA(psMetadata *camera)
 {
-    pmFPA* fpa = pmFPAAlloc(camera);
+    pmFPA* fpa = pmFPAAlloc(camera, NULL);
     fpa->fromTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();
     fpa->toTPA = PS_CREATE_2D_IDENTITY_PLANE_TRANSFORM();