diff --git a/inc/test-RRULE.php b/inc/test-RRULE.php
index af7add0b..ef8808c5 100644
--- a/inc/test-RRULE.php
+++ b/inc/test-RRULE.php
@@ -23,36 +23,33 @@ class RRuleTest {
   }
 
   function PHPTest() {
-    echo "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=\n";
-    echo "$this->dtstart - $this->recur\n";
-    echo "$this->description\n";
-
+    $result = '';
     $rule = new RRule( new iCalDate($this->dtstart), $this->recur );
     $i = 0;
     do {
-      if ( ($i % 4) == 0 ) echo "\n";
       $date = $rule->GetNext();
       if ( isset($date) ) {
-        echo "   " . $date->Render();
+        if ( ($i++ % 4) == 0 ) $result .= "\n";
+        $result .= "   " . $date->Render();
       }
     }
-    while( isset($date) && $i++ < 30 );
-
-    echo "\n\n";
+    while( isset($date) && $i < 30 );
+    return $result;
   }
 
   function SQLTest() {
+    $result = '';
     $sql = "SELECT event_instances::timestamp AS event_date FROM event_instances(?,?) LIMIT 30;";
     $qry = new PgQuery($sql, $this->dtstart, $this->recur);
-    printf( "%s\n", $qry->querystring);
+    // printf( "%s\n", $qry->querystring);
     if ( $qry->Exec("test") && $qry->rows > 0 ) {
       $i = 0;
       while( $row = $qry->Fetch() ) {
-        if ( ($i++ % 4) == 0 ) echo "\n";
-        echo "   " . $row->event_date;
+        if ( ($i++ % 4) == 0 ) $result .= "\n";
+        $result .= "   " . $row->event_date;
       }
     }
-    echo "\n\n";
+    return $result;
   }
 }
 
@@ -64,18 +61,35 @@ $tests = array(
   , new RRuleTest( "3/wk for 5 weeks", "20081101T160000", "RRULE:FREQ=WEEKLY;COUNT=15;INTERVAL=1;BYDAY=MO,WE,FR" )
   , new RRuleTest( "Monthly forever", "20061104T073000", "RRULE:FREQ=MONTHLY" )
   , new RRuleTest( "Monthly, on the 1st monday, 2nd wednesday, 3rd friday and last sunday, forever", "20061117T073000", "RRULE:FREQ=MONTHLY;BYDAY=1MO,2WE,3FR,-1SU" )
-  , new RRuleTest( "Every working day", "20081020T103000", "RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR" )
   , new RRuleTest( "The last working day of each month", "20061107T113000", "RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1" )
+  , new RRuleTest( "Every working day", "20081020T103000", "RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR" )
   , new RRuleTest( "Every working day", "20081020T110000", "RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR" )
   , new RRuleTest( "1st Tuesday, 2nd Wednesday, 3rd Thursday & 4th Friday, every March, June, September, October and December", "20081001T133000", "RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1TU,2WE,3TH,4FR;BYMONTH=3,6,9,10,12" )
   , new RRuleTest( "Every tuesday and friday", "20081017T084500", "RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR" )
   , new RRuleTest( "Every tuesday and friday", "20081017T084500", "RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,FR" )
   , new RRuleTest( "Every tuesday and friday", "20081017T084500", "RRULE:FREQ=DAILY;INTERVAL=1;BYDAY=TU,FR" )
+  , new RRuleTest( "Time zone 1", "19700315T030000", "FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3" )
+  , new RRuleTest( "Time zone 2", "19700927T020000", "FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=9" )
+  , new RRuleTest( "Time zone 3", "19810329T030000", "FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU" )
+  , new RRuleTest( "Time zone 4", "20000404T020000", "FREQ=YEARLY;BYDAY=1SU;BYMONTH=4" )
 );
 
 foreach( $tests AS $k => $test ) {
-  $test->PHPTest();
-//  $test->SQLTest();
+  echo "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=\n";
+  echo "$test->dtstart - $test->recur\n";
+  echo "$test->description\n";
+  $php_result = $test->PHPTest();
+/*
+  $sql_result = $test->SQLTest();
+  if ( $php_result == $sql_result ) {
+    echo "PHP & SQL results are identical :-)\n";
+  }
+  else {
+    echo "PHP & SQL results differ :-(\n";
+  }
+*/
+  echo "PHP Result:\n$php_result\n\n";
+//  echo "SQL Result:\n$sql_result\n\n";  // Still under development
 }