Index: ccr/trunk/p/GPLCCR.m
===================================================================
--- ccr/trunk/p/GPLCCR.m	(revision 27)
+++ ccr/trunk/p/GPLCCR.m	(revision 28)
@@ -7,4 +7,5 @@
         ; Select a patient for real.
         S DIC=2,DIC(0)="AEMQ" D ^DIC
+        I Y<1 Q ; EXIT
         S DFN=$P(Y,U,1) ; SET THE PATIENT
         N CCRGLO
@@ -26,5 +27,5 @@
         ;
         ; DELETE THE BODY, ACTORS AND SIGNATURES SECTIONS FROM THE CCR GLOBAL
-        ; THESE WILL BE POPULATED WITH CALLS TO THE XPATH PROCESSING ROUTINES
+        ; THESE WILL BE POPULATED AFTER CALLS TO THE XPATH PROCESSING ROUTINES
         D REPLACE^GPLXPATH(CCRGLO,"","//ContinuityOfCareRecord/Body")
         D REPLACE^GPLXPATH(CCRGLO,"","//ContinuityOfCareRecord/Actors")
@@ -50,12 +51,4 @@
         . D INSERT^GPLXPATH(CCRGLO,OXML,"//ContinuityOfCareRecord/Body")
         . I DEBUG F GPLI=1:1:@OXML@(0) W @OXML@(GPLI),!
-        . ; D QOPEN^GPLXPATH("CCRBLD",CCRGLO,"//ContinuityOfCareRecord/Body")
-        . ; D QUEUE^GPLXPATH("CCRBLD",OXML,1,@OXML@(0))
-        . ; D QCLOSE^GPLXPATH("CCRBLD",CCRGLO,"//ContinuityOfCareRecord/Body")
-        . ; I DEBUG W "GOING TO BUILD CCR",!
-        . ; N CCRTMP
-        . ; D BUILD^GPLXPATH("CCRBLD","CCRTMP")
-        . ; I DEBUG F GPLI=1:1:CCRTMP(0) W CCRTMP(GPLI),!
-        . ; D CP^GPLXPATH("CCRTMP",CCRGLO)
         Q
         ;
@@ -68,10 +61,8 @@
          ;
 TEST   ; RUN ALL THE TEST CASES
-      N ZTMP
-      D ZLOAD^GPLUNIT("ZTMP","GPLCCR")
-      D ZTEST^GPLUNIT(.ZTMP,"ALL")
-      W !
-      ; W "THE TESTS!",!
-      ; ZWR ZTMP
+      ;D TESTALL^GPLUNIT("GPLCCR")
+      D ZTEST^GPLCCR("PROBLEMS")
+      W "TESTING TESTING 123",!
+      D ZTEST^GPLCCR("CCR")
       Q
       ;
@@ -89,5 +80,11 @@
       ;
 ;;><TEST>
-;;><INIT>
+;;><PROBLEMS>
 ;;>>>K GPL S GPL=""
+;;>>>D CCRRPC^GPLCCR(.GPL,"2","PROBLEMS")
+;;>>?@GPL@(@GPL@(0))="</Problems>"
+;;><CCR>
+;;>>>K GPL S GPL=""
+;;>>>D CCRRPC^GPLCCR(.GPL,"2","CCR")
+;;>>?@GPL@(@GPL@(0))="</ContinutiyOfCareRecord>"
 ;;></TEST>
Index: ccr/trunk/p/GPLUNIT.m
===================================================================
--- ccr/trunk/p/GPLUNIT.m	(revision 27)
+++ ccr/trunk/p/GPLUNIT.m	(revision 28)
@@ -99,19 +99,19 @@
       Q
       ;
-GTSTS(ZARY,RTN) ; return an array of test names
-        N I,J S I="" S I=$O(ZARY("TESTS",I))
+GTSTS(GTZARY,RTN) ; return an array of test names
+        N I,J S I="" S I=$O(GTZARY("TESTS",I))
         F J=0:0  Q:I=""  D
         . D PUSH^GPLXPATH(RTN,I)
-        . S I=$O(ZARY("TESTS",I))
+        . S I=$O(GTZARY("TESTS",I))
         Q
         ;
 TESTALL(RNM) ; RUN ALL THE TESTS
-        N I,J,ZTMP,TSTS,TOTP,TOTF
+        N I,J,TZTMP,TSTS,TOTP,TOTF
         S TOTP=0 S TOTF=0
-        D ZLOAD^GPLUNIT("ZTMP",RNM)
-        D GTSTS(.ZTMP,"TSTS")
+        D ZLOAD^GPLUNIT("TZTMP",RNM)
+        D GTSTS(.TZTMP,"TSTS")
         F I=1:1:TSTS(0) D  ;
         . S TPASSED=0 S TFAILED=0
-        . D ZTEST(.ZTMP,TSTS(I))
+        . D ZTEST^GPLUNIT(.TZTMP,TSTS(I))
         . S TOTP=TOTP+TPASSED
         . S TOTF=TOTF+TFAILED