Index: trunk/psModules/test/camera/Makefile.am
===================================================================
--- trunk/psModules/test/camera/Makefile.am	(revision 16007)
+++ trunk/psModules/test/camera/Makefile.am	(revision 16008)
@@ -26,6 +26,6 @@
 	tap_pmFPACellSquish \
 	tap_pmReadoutStack \
-	tap_pmReadoutFake
-
+	tap_pmReadoutFake \
+	tap_pmFPACopy
 
 if BUILD_TESTS
Index: trunk/psModules/test/camera/tap_pmFPA.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPA.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPA.c	(revision 16008)
@@ -104,5 +104,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     fpa->hdu = pmHDUAlloc(NULL);
Index: trunk/psModules/test/camera/tap_pmFPACellSquish.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPACellSquish.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPACellSquish.c	(revision 16008)
@@ -146,5 +146,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     psArrayRealloc(fpa->chips, NUM_CHIPS);
Index: trunk/psModules/test/camera/tap_pmFPAExtent.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAExtent.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPAExtent.c	(revision 16008)
@@ -145,5 +145,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
 
Index: trunk/psModules/test/camera/tap_pmFPAFlags.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAFlags.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPAFlags.c	(revision 16008)
@@ -168,5 +168,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     psArrayRealloc(fpa->chips, NUM_CHIPS);
Index: trunk/psModules/test/camera/tap_pmFPAHeader.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAHeader.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPAHeader.c	(revision 16008)
@@ -147,5 +147,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
 
Index: trunk/psModules/test/camera/tap_pmFPAMaskW.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAMaskW.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPAMaskW.c	(revision 16008)
@@ -157,5 +157,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
 
Index: trunk/psModules/test/camera/tap_pmFPAReadWrite.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAReadWrite.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPAReadWrite.c	(revision 16008)
@@ -147,5 +147,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
 
Index: trunk/psModules/test/camera/tap_pmFPAUtils.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAUtils.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPAUtils.c	(revision 16008)
@@ -139,5 +139,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
 
Index: trunk/psModules/test/camera/tap_pmFPAView.c
===================================================================
--- trunk/psModules/test/camera/tap_pmFPAView.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmFPAView.c	(revision 16008)
@@ -9,5 +9,4 @@
 */
 
-#define	ERR_TRACE_LEVEL		0
 #define CHIP_ALLOC_NAME        "ChipName"
 #define CELL_ALLOC_NAME        "CellName"
@@ -152,5 +151,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     fpa->hdu = pmHDUAlloc("fpaExtName");
Index: trunk/psModules/test/camera/tap_pmHDUUtils.c
===================================================================
--- trunk/psModules/test/camera/tap_pmHDUUtils.c	(revision 16007)
+++ trunk/psModules/test/camera/tap_pmHDUUtils.c	(revision 16008)
@@ -148,5 +148,7 @@
     fpa->toSky = psProjectionAlloc(0.0,0.0,10.0,10.0,PS_PROJ_TAN);
     psMetadataAddS32(fpa->analysis, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
-    psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    if (camera != NULL) {
+        psMetadataAddS32((psMetadata *) fpa->camera, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
+    }
     psMetadataAddS32(fpa->concepts, PS_LIST_HEAD, MISC_NAME, 0, NULL, MISC_NUM);
     fpa->hdu = pmHDUAlloc("fpaExtName");