diff --git a/test-tc.py b/test-tc.py
index 8e4afe1..dd8fb89 100755
--- a/test-tc.py
+++ b/test-tc.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2003-2004 TundraWare Inc.  All Rights Reserved.
 
 PROGNAME = "tconfpy Test Driver"
-RCSID = "$Id: test-tc.py,v 1.136 2004/04/27 22:21:11 tundra Exp $"
+RCSID = "$Id: test-tc.py,v 1.137 2005/01/13 20:48:50 tundra Exp $"
 VERSION = RCSID.split()[2]
 
 # Copyright Information
@@ -119,7 +119,7 @@
 
 def BuildSymTbl(syms):
 
-    symtbl ={}
+    symtbl = SymbolTable()
 
     for sym in syms:
 
@@ -135,7 +135,7 @@
 
             pos += 1
 
-        symtbl[sym[0]] = des
+        symtbl.Symbols[sym[0]] = des
 
     return symtbl
 
@@ -255,7 +255,7 @@
     else:
 
         # The default is no pre-defined symbols
-        st = {}
+        st = SymbolTable()
 
         if ST:
             st = BuildSymTbl(syms)
@@ -272,8 +272,8 @@
 
             # And stuff them into the symbol table
 
-            st["MyComplex1"] = mc1
-            st["MyComplex2"] = mc2
+            st.Symbols["MyComplex1"] = mc1
+            st.Symbols["MyComplex2"] = mc2
 
         if LIMITNS:
 
@@ -283,7 +283,7 @@
             des.LegalVals = [r"^NS.*", ] # List of permitted namespace regexes
             des.Min = 3
             des.Max = 8
-            st["NAMESPACE"] = des
+            st.Symbols["NAMESPACE"] = des
 
         
         # Support for templating
@@ -297,7 +297,9 @@
 
         # Call the parser and process the results
 
-        retval = ParseConfig(fn, InitialSymTable=st,
+        retval = ParseConfig(fn,
+                             CallingProgram="FeeFiFoFum",
+                             InitialSymTable=st,
                              AllowNewVars=ALLOWVAR,
                              Templates=tl,
                              TemplatesOnly=TEMPONLY,
@@ -306,7 +308,7 @@
                              Debug=DEBUG
                             )
 
-        if retval.Errors:
+        if retval.ErrMsgs:
             print "Errors Were Found In '%s'!" % fn
         else:
             print "No Errors Found In '%s'!" % fn
@@ -316,14 +318,14 @@
 
         # Format and display the results
 
-        dumpreturn("SYMBOL TABLE", retval.SymTable, isdict=True)
-        dumpreturn("ERRORS", retval.Errors)
-        dumpreturn("WARNINGS", retval.Warnings)
+        dumpreturn("SYMBOL TABLE", retval.Symbols, isdict=True)
+        dumpreturn("ERRORS", retval.ErrMsgs)
+        dumpreturn("WARNINGS", retval.WarnMsgs)
 
         if DEBUG:
-            dumpreturn("DEBUG", retval.Debug)
+            dumpreturn("DEBUG", retval.DebugMsgs)
 
-        dumpreturn("LITERAL LINES", retval.Literals)
+        dumpreturn("LITERAL LINES", retval.LiteralLines)