Index: trunk/psModules/test/objects/tap_pmModelClass.c
===================================================================
--- trunk/psModules/test/objects/tap_pmModelClass.c	(revision 15726)
+++ trunk/psModules/test/objects/tap_pmModelClass.c	(revision 15985)
@@ -5,4 +5,10 @@
 #include "tap.h"
 #include "pstap.h"
+/* STATUS:
+    All functions are tested except pmModelClassCleanup() which is deferred
+    because there's no way to test that it frees a static variable, except
+    throug hthe memory leak tests
+*/
+
 #define MISC_NUM                32
 #define MISC_NAME              "META00"
@@ -41,5 +47,5 @@
     psLogSetLevel(PS_LOG_INFO);
     psTraceSetLevel("err", ERR_TRACE_LEVEL);
-    plan_tests(1);
+    plan_tests(37);
 
     // ----------------------------------------------------------------------
@@ -56,8 +62,10 @@
 
     // ----------------------------------------------------------------------
-    // Test pmModelClassCleanup()
+    // Test pmModelClassCleanup(), pmModelClassSelect()
     // Basically, call pmModelClassInit(), then pmModelClassCleanup(), and ensure that
     // various default models are not there.
-    {
+    // XXX: We don't run this test because the spec changed and pmModelClassSelect() now calls
+    // pmModelClassInit().
+    if (0) {
         psMemId id = psMemGetId();
         pmModelClassInit();