Index: /trunk/psLib/test/astro/tap_psTime_01.c
===================================================================
--- /trunk/psLib/test/astro/tap_psTime_01.c	(revision 24302)
+++ /trunk/psLib/test/astro/tap_psTime_01.c	(revision 24303)
@@ -842,10 +842,8 @@
     {
         psMemId id = psMemGetId();
-        bool status = psTimeConvert(NULL, PS_TIME_TAI);
-
-        ok(status == false, "psTimeConvert(NULL, PS_TIME_TAI) returned NULL");
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-
-        psFree(time2);
+        bool status= psTimeConvert(NULL, PS_TIME_TAI);
+
+        ok(status== false, "psTimeConvert(NULL, PS_TIME_TAI) returned NULL");
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
 
@@ -858,8 +856,7 @@
         psMemId id = psMemGetId();
         psTime *time1 = psTimeAlloc(PS_TIME_TAI);
-        psTime *time2 = psTimeConvert(time1,-100);
-        ok(time2 == NULL, "psTimeConvert(time1, -100) returned NULL");
-        psFree(time1);
-        psFree(time2);
+        bool status = psTimeConvert(time1,-100);
+        ok(status == false, "psTimeConvert(time1, -100) returned false");
+        psFree(time1);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -873,8 +870,7 @@
         psMemId id = psMemGetId();
         psTime *time1 = psTimeAlloc(PS_TIME_UTC);
-        psTime *time2 = psTimeConvert(time1,-100);
-        ok(time2 == NULL, "psTimeConvert(time1, -100) returned NULL");
-        psFree(time1);
-        psFree(time2);
+        bool status = psTimeConvert(time1,-100);
+        ok(status == false, "psTimeConvert(time1, -100) returned false");
+        psFree(time1);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -888,8 +884,7 @@
         psMemId id = psMemGetId();
         psTime *time1 = psTimeAlloc(PS_TIME_TT);
-        psTime *time2 = psTimeConvert(time1,-100);
-        ok(time2 == NULL, "psTimeConvert(time1, -100) returned NULL");
-        psFree(time1);
-        psFree(time2);
+        bool status = psTimeConvert(time1,-100);
+        ok(status == false, "psTimeConvert(time1, -100) returned false");
+        psFree(time1);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -903,8 +898,7 @@
         psTime *time1 = psTimeAlloc(PS_TIME_TAI);
         time1->type = -100;
-        psTime *time2 = psTimeConvert(time1,PS_TIME_TAI);
-        ok(time2 == NULL, "psTimeConvert(time1, PS_TIME_TAI) returned NULL");
-        psFree(time1);
-        psFree(time2);
+        bool status = psTimeConvert(time1,PS_TIME_TAI);
+        ok(status == false, "psTimeConvert(time1, PS_TIME_TAI) returned false");
+        psFree(time1);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -919,8 +913,7 @@
         psTime *time1 = psTimeAlloc(PS_TIME_TAI);
         time1->nsec = 2e9;
-        psTime *time2 = psTimeConvert(time1, PS_TIME_TAI);
-        ok(time2 == NULL, "psTimeConvert(time1, PS_TIME_TAI) returns NULL for incorrect psTime object");
-        psFree(time1);
-        psFree(time2);
+        bool status = psTimeConvert(time1, PS_TIME_TAI);
+        ok(status == false, "psTimeConvert(time1, PS_TIME_TAI) returns NULL for incorrect psTime object");
+        psFree(time1);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -929,4 +922,5 @@
     // psTimeConvert()
     //Attempt to convert a time to the same type
+    //Should return true because time->type == type
     {
         psMemId id = psMemGetId();
@@ -936,10 +930,6 @@
         time1->type = PS_TIME_TAI;
         time1->leapsecond = false;
-        psTime *time2 = psTimeConvert(time1, PS_TIME_TAI);
-        ok(time2 == time1, "psTimeConvert(time, ...) returns time for conversion to same type");
-        is_long(time2->sec, 1, "time->sec");
-        is_long(time2->nsec, 2, "time->nsec");
-        ok(time2->type == PS_TIME_TAI, "time->type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1, PS_TIME_TAI);
+        ok(status == true, "psTimeConvert(time, ...) returns true for conversion to same type");
 
         psFree(time1);
@@ -957,10 +947,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_TAI);
-        ok(time2 == time1, "psTimeConvert(time, ...) returns time after conversion to a different type");
-        is_long(time2->sec, testTime1SecondsTAI, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsTAI, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_TAI, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_TAI);
+        ok(status == true, "psTimeConvert(time, ...) returns true after conversion to a different type");
+        is_long(time1->sec, testTime1SecondsTAI, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsTAI, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_TAI, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -978,10 +968,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_TT);
-        ok(time2 == time1, "psTimeConvert(time, ...) returns time after conversion to a different type");
-        is_long(time2->sec, testTime1SecondsTT, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsTT, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_TT, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_TT);
+        ok(status == true, "psTimeConvert(time, ...) returns true after conversion to a different type");
+        is_long(time1->sec, testTime1SecondsTT, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsTT, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_TT, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -999,10 +989,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_UT1);
-        ok(time2 == time1, "psTimeConvert(time, ...) returns time after conversion to a different type");
-        is_long(time2->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_UT1);
+        ok(status == true, "psTimeConvert(time, ...) returns true after conversion to a different type");
+        is_long(time1->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -1019,10 +1009,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_UTC);
-        ok(time2 == time1, "psTimeConvert(time, ...) returns time after conversion to a different type");
-        is_long(time2->sec, testTime1SecondsUTC, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsUTC, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_UTC, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_UTC);
+        ok(status == true, "psTimeConvert(time, ...) returns true after conversion to a different type");
+        is_long(time1->sec, testTime1SecondsUTC, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsUTC, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_UTC, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -1041,10 +1031,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_TT);
-        ok(time2 == time1, "psTimeConvert() returned time for conversion to same type");
-        is_long(time2->sec, testTime1SecondsTT, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsTT, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_TT, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_TT);
+        ok(status == true, "psTimeConvert() returned true for conversion to same type");
+        is_long(time1->sec, testTime1SecondsTT, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsTT, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_TT, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -1062,10 +1052,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_UT1);
-        ok(time1 == time2, "psTimeConvert() returned time for conversion to same type");
-        is_long(time2->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_UT1);
+        ok(status == true, "psTimeConvert() returned true for conversion to same type");
+        is_long(time1->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -1083,10 +1073,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_UTC);
-        ok(time2 == time1, "psTimeConvert() returned time for conversion to same type");
-        is_long(time2->sec, testTime1SecondsUTC, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsUTC, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_UTC, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_UTC);
+        ok(status == true, "psTimeConvert() returned true for conversion to same type");
+        is_long(time1->sec, testTime1SecondsUTC, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsUTC, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_UTC, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -1104,10 +1094,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_TAI);
-        ok(time2 == time1, "psTimeConvert() returned time for conversion to same type");
-        is_long(time2->sec, testTime1SecondsTAI, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsTAI, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_TAI, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_TAI);
+        ok(status == true, "psTimeConvert() returned true for conversion to same type");
+        is_long(time1->sec, testTime1SecondsTAI, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsTAI, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_TAI, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -1125,10 +1115,10 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1,PS_TIME_UT1);
-        ok(time1 == time2, "psTimeConvert() returned time for conversion to same type");
-        is_long(time2->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
-        is_long(time2->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
-        ok(time2->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
-        is_bool(time2->leapsecond, false, "time->leapsecond");
+        bool status = psTimeConvert(time1,PS_TIME_UT1);
+        ok(status == true, "psTimeConvert() returned true for conversion to same type");
+        is_long(time1->sec, testTime1SecondsUT1, "psTimeConvert() returned the correct ->sec");
+        is_long(time1->nsec, testTime1NanosecondsUT1, "psTimeConvert() returned the correct ->nsec");
+        ok(time1->type == PS_TIME_UT1, "psTimeConvert() returned the correct type");
+        is_bool(time1->leapsecond, false, "time->leapsecond");
 
         psFree(time1);
@@ -1147,8 +1137,7 @@
         time1->leapsecond = false;
 
-        psTime *time2 = psTimeConvert(time1, PS_TIME_UTC);
-        ok(time2 == NULL, "psTimeConvert() returned NULL for conversion from UT1");
-        psFree(time1);
-        psFree(time2);
+        bool status = psTimeConvert(time1, PS_TIME_UTC);
+        ok(status == false, "psTimeConvert() returned false for conversion from UT1");
+        psFree(time1);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
Index: /trunk/psLib/test/astro/tap_psTime_03.c
===================================================================
--- /trunk/psLib/test/astro/tap_psTime_03.c	(revision 24302)
+++ /trunk/psLib/test/astro/tap_psTime_03.c	(revision 24303)
@@ -494,5 +494,5 @@
             psFree(timeStr);
 
-            time = psTimeConvert(time, PS_TIME_TT);
+            bool status = psTimeConvert(time, PS_TIME_TT);
             timeStr = psTimeToISO(time);
             is_str(timeStr, testTimeBStrTT[i], "TT ISO string");
@@ -500,5 +500,5 @@
 
             // Verify UTC ISO string
-            time = psTimeConvert(time, PS_TIME_UTC);
+            status = psTimeConvert(time, PS_TIME_UTC);
             time->leapsecond = testTimeBLeapsecond[i];
             timeStr = psTimeToISO(time);
@@ -506,5 +506,5 @@
             psFree(timeStr);
 
-            time = psTimeConvert(time, PS_TIME_UT1);
+            status = psTimeConvert(time, PS_TIME_UT1);
             timeStr = psTimeToISO(time);
             is_str(timeStr, testTimeBStrUT1[i], "UT1 ISO string");