Index: trunk/psLib/test/types/execute_tap
===================================================================
--- trunk/psLib/test/types/execute_tap	(revision 8925)
+++ trunk/psLib/test/types/execute_tap	(revision 8930)
@@ -14,2 +14,4 @@
 ./tap_psArguments_all
 ./tap_psPixels_all
+./tap_psHash_all
+./tap_psBitSet_all
Index: trunk/psLib/test/types/tap_psBitSet_all.c
===================================================================
--- trunk/psLib/test/types/tap_psBitSet_all.c	(revision 8930)
+++ trunk/psLib/test/types/tap_psBitSet_all.c	(revision 8930)
@@ -0,0 +1,95 @@
+/**
+ *  C Implementation: tap_psBitSet_all
+ *
+ * Description:  Tests for psBitSetAlloc, psBitSetSet, psMemCheckBitSet, psBitSetClear,
+ *               psBitSetTest, psBitSetOp, psBitSetNot, psBitSetToString
+ *
+ * Author: dRob <David.Robbins@mhpcc.hpc.mil>, (C) 2006
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ *
+ */
+
+#include <pslib.h>
+
+#include "tap.h"
+#include "pstap.h"
+
+void testBitSetBasics(void);
+void testBitSetOps(void);
+
+int main(void)
+{
+    plan_tests(5);
+
+    diag("Tests for psBitSet Functions");
+
+    testBitSetBasics();
+    testBitSetOps();
+
+    done();
+}
+
+void testBitSetBasics(void)
+{
+    diag("  >>>Test 1:  psBitSet Basic Fxns");
+
+    psBitSet *noBits = NULL;
+    psBitSet *bs = NULL;
+
+    //Return NULL for attempt to sort NULL psArray input.
+    {
+        noBits = psBitSetAlloc(-1);
+        ok( noBits == NULL,
+            "psBitSetAlloc:         return NULL for negative BitSet-size input.");
+    }
+    //Return properly allocated 0-size psBitSet
+    {
+        bs = psBitSetAlloc(0);
+        ok( bs != NULL && psMemCheckBitSet(bs) && bs->n == 0,
+            "psBitSetAlloc:         return properly allocated psBitSet.");
+    }
+    //Make sure psMemCheckBitSet works correctly - return false
+    {
+        int j = 2;
+        ok( !psMemCheckBitSet(&j),
+            "psMemCheckBitSet:      return false for non-BitSet input.");
+    }
+    //Return properly allocated psBitSet
+    {
+        psFree(bs);
+        bs = psBitSetAlloc(8);
+        ok( bs != NULL && psMemCheckBitSet(bs) && bs->n == 1,
+            "psBitSetAlloc:         return properly allocated psBitSet.");
+    }
+
+    //Check for Memory leaks
+    {
+        psFree(bs);
+        checkMem();
+    }
+}
+
+void testBitSetOps(void)
+{
+    diag("  >>>Test 2:  psBitSet Operation Fxns");
+
+
+    //Check for Memory leaks
+    {
+        checkMem();
+    }
+}
+
+/*
+    //Attempt to reallocate the psArray - smaller
+{
+    skip_start(  !psArraySet(a, 0, s32) || !psArraySet(a, 1, s32), 1,
+                  "Skipping 1 tests because psArraySet failed");
+    ok( a->n == 1 && a->nalloc == 1 && *s32_2 == 1,
+        "psArrayRealloc:   return properly reallocated psArray.");
+    skip_end();
+}
+ 
+*/
+
Index: trunk/psLib/test/types/tap_psList_all.c
===================================================================
--- trunk/psLib/test/types/tap_psList_all.c	(revision 8930)
+++ trunk/psLib/test/types/tap_psList_all.c	(revision 8930)
@@ -0,0 +1,79 @@
+/**
+ *  C Implementation: tap_psHash_all
+ *
+ * Description:  Tests for psHashAlloc, psHashAdd, psMemCheckHash, psHashLookup,
+ *               psHashRemove, psHashKeyList, psHashToArray
+ *
+ * Author: dRob <David.Robbins@mhpcc.hpc.mil>, (C) 2006
+ *
+ * Copyright: See COPYING file that comes with this distribution
+ *
+ */
+
+#include <pslib.h>
+
+#include "tap.h"
+#include "pstap.h"
+
+void testHashCreate(void);
+//void testHashManip(void);
+//void testHashConvert(void);
+
+int main(void)
+{
+    plan_tests(25);
+
+    diag("Tests for psHash Functions");
+
+    testHashCreate();
+    //    testHashManip();
+    //    testHashConvert();
+
+    done();
+}
+
+void testHashCreate(void)
+{
+    diag("  >>>Test 1:  psHash Creation Fxns");
+
+
+    //Check for Memory leaks
+    {
+        checkMem();
+    }
+}
+
+/*
+    //Return NULL for attempt to sort NULL psArray input.
+{
+    psArray *temp = NULL;
+    temp = psArraySort(temp, (psComparePtrFunc)psCompareDescendingS32Ptr);
+    ok( temp == NULL,
+        "psArraySort:     return NULL for NULL input psArray.");
+}
+    //Attempt to reallocate the psArray - smaller
+{
+    psS32 *s32 = (psS32*)psAlloc(sizeof(psS32));
+    *s32 = 1;
+    psS32 *s32_2 = (psS32*)psAlloc(sizeof(psS32));
+    *s32_2 = 2;
+    skip_start(  !psArraySet(a, 0, s32) || !psArraySet(a, 1, s32), 1,
+                  "Skipping 1 tests because psArraySet failed");
+    a = psArrayRealloc(a, 1);
+    *s32_2 = *((psS32*)(a->data[0]));
+    ok( a->n == 1 && a->nalloc == 1 && *s32_2 == 1,
+        "psArrayRealloc:   return properly reallocated psArray.");
+    skip_end();
+    psFree(s32);
+    psFree(s32_2);
+}
+    //Make sure psMemCheckHash works correctly - return false
+{
+    int j = 2;
+    ok( !psMemCheckHash(&j),
+         "psMemCheckHash:       return false for non-Hash input.");
+}
+    //Allocate a hashBucket by inserting a psHash entry - return true
+    psMetadataItem *itemBool = psMetadataItemAllocBool("itemBool", "", true);
+*/
+