fix tkblt tests

18 files changed, 700 insertions, 701 deletions

diff --git a/generic/tkbltGrElemLine.C b/generic/tkbltGrElemLine.C
index 9e3f39a..e8e6413 100644
--- a/generic/tkbltGrElemLine.C
+++ b/generic/tkbltGrElemLine.C
@@ -2009,7 +2009,7 @@ void LineElement::drawSCross(Display* display, Drawable drawable,
 {
   LinePenOptions* penOps = (LinePenOptions*)penPtr->ops();
 
-  Point pattern[4];
+  Point2d pattern[4];
   if (penOps->symbol.type == SYMBOL_SCROSS) {
     r2 = (int)(r2 * M_SQRT1_2);
     pattern[3].y = pattern[2].x = pattern[0].x = pattern[0].y = -r2;
@@ -2051,7 +2051,7 @@ void LineElement::drawCross(Display *display, Drawable drawable,
    *          9   8
    */
   int d = (r2 / 3);
-  Point pattern[13];
+  Point2d pattern[13];
   pattern[0].x = pattern[11].x = pattern[12].x = -r2;
   pattern[2].x = pattern[1].x = pattern[10].x = pattern[9].x = -d;
   pattern[3].x = pattern[4].x = pattern[7].x = pattern[8].x = d;
@@ -2122,7 +2122,7 @@ void LineElement::drawDiamond(Display *display, Drawable drawable,
    *                      (fifth) point connects the first and
    *            3         last points.
    */
-  Point pattern[5];
+  Point2d pattern[5];
   pattern[1].y = pattern[0].x = -r1;
   pattern[2].y = pattern[3].x = pattern[0].y = pattern[1].x = 0;
   pattern[3].y = pattern[2].x = r1;
@@ -2184,7 +2184,7 @@ void LineElement::drawArrow(Display *display, Drawable drawable,
    *      2           1   last points.
    */
 
-  Point pattern[4];
+  Point2d pattern[4];
   if (penOps->symbol.type == SYMBOL_ARROW) {
     pattern[3].x = pattern[0].x = 0;
     pattern[3].y = pattern[0].y = h1;
diff --git a/generic/tkbltGrHairs.h b/generic/tkbltGrHairs.h
index a86d0c6..e489f79 100644
--- a/generic/tkbltGrHairs.h
+++ b/generic/tkbltGrHairs.h
@@ -56,7 +56,7 @@ namespace Blt {
 
     int visible_;
     GC gc_;
-    Point segArr_[4];
+    Point2d segArr_[4];
 
   public:
     Crosshairs(Graph*);
diff --git a/generic/tkbltGrMisc.h b/generic/tkbltGrMisc.h
index ba86b75..38b78cb 100644
--- a/generic/tkbltGrMisc.h
+++ b/generic/tkbltGrMisc.h
@@ -67,10 +67,12 @@ using namespace std;
 namespace Blt {
   class Graph;
 
+  /*
   typedef struct {
     int x, y;
   } Point;
-
+  */
+  
   typedef struct {
     int x, y;
     unsigned width, height;
diff --git a/tests/axis.tcl b/tests/axis.tcl
index 80f97ea..e5a2f41 100644
--- a/tests/axis.tcl
+++ b/tests/axis.tcl
@@ -1,104 +1,104 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-$graph axis configure x -bd 2 -background cyan -title "X\nAxis" -limitsformat "%g"
-$graph axis configure y -bd 2 -background cyan -title "Y\nAxis"
-bltCmd $graph axis activate y
+$bltgr axis configure x -bd 2 -background cyan -title "X\nAxis" -limitsformat "%g"
+$bltgr axis configure y -bd 2 -background cyan -title "Y\nAxis"
+bltCmd $bltgr axis activate y
 
 puts stderr "Testing Axis..."
 
-bltTest3 $graph axis y -activeforeground red $dops
-bltTest3 $graph axis y -activerelief sunken $dops
-#bltTest3 $graph axis x -autorange 10 $dops
-bltTest3 $graph axis x -background yellow $dops
-bltTest3 $graph axis x -bg blue $dops
-bltTest3 $graph axis x -bindtags {aa} 0
-bltTest3 $graph axis y -bd 4 $dops
-bltTest3 $graph axis y -borderwidth 4 $dops
-#bltTest3 $graph axis x -checklimits $dops
-bltTest3 $graph axis x -color red $dops
-#bltTest3 $graph axis x -command $dops
-bltTest3 $graph axis x -descending yes $dops
-bltTest3 $graph axis x -exterior no $dops
-bltTest3 $graph axis x -fg magenta $dops
-bltTest3 $graph axis x -foreground yellow $dops
-bltTest3 $graph axis x -grid no $dops
-bltTest3 $graph axis x -gridcolor blue $dops
-bltTest3 $graph axis x -griddashes {8 3} $dops
-bltTest3 $graph axis x -gridlinewidth 2 $dops
-bltTest3 $graph axis x -gridminor no $dops
-bltTest3 $graph axis x -gridminorcolor blue $dops
-bltTest3 $graph axis x -gridminordashes {8 3} $dops
-bltTest3 $graph axis x -gridminorlinewidth 2 $dops
-bltTest3 $graph axis x -hide yes $dops
-bltTest3 $graph axis x -justify left $dops
-bltTest3 $graph axis x -justify center $dops
-bltTest3 $graph axis x -justify right $dops
-bltTest3 $graph axis x -labeloffset yes $dops
-bltTest3 $graph axis x -limitscolor red $dops
-bltTest3 $graph axis x -limitsfont {times 18 bold italic} $dops
-bltTest3 $graph axis x -limitsformat "%e" $dops
-bltTest3 $graph axis x -linewidth 2 $dops
-bltTest3 $graph axis x -logscale yes $dops
-#bltTest3 $graph axis x -loosemin $dops
-#bltTest3 $graph axis x -loosemax $dops
-#bltTest3 $graph axis x -majorticks $dops
-#bltTest3 $graph axis x -max $dops
-#bltTest3 $graph axis x -min $dops
-#bltTest3 $graph axis x -minorticks $dops
-bltTest3 $graph axis x -relief flat $dops
-bltTest3 $graph axis x -relief groove $dops
-bltTest3 $graph axis x -relief raised $dops
-bltTest3 $graph axis x -relief ridge $dops
-bltTest3 $graph axis x -relief solid $dops
-bltTest3 $graph axis x -relief sunken $dops
-bltTest3 $graph axis x -rotate 45 $dops
-#bltTest3 $graph axis x -scrollcommand $dops
-#bltTest3 $graph axis x -scrollincrement $dops
-#bltTest3 $graph axis x -scrollmax $dops
-#bltTest3 $graph axis x -scrollmin $dops
-##bltTest3 $graph axis x -shiftby 10 $dops
-bltTest3 $graph axis x -showticks no $dops
-bltTest3 $graph axis x -stepsize 10 $dops
-bltTest3 $graph axis x -subdivisions 4 $dops
-##bltTest3 $graph axis x -tickanchor n $dops
-bltTest3 $graph axis x -tickfont {times 12 bold italic} $dops
-bltTest3 $graph axis x -ticklength 20 $dops
-bltTest3 $graph axis x -tickdefault 10 $dops
-bltTest3 $graph axis x -title {This is a Title} $dops
-bltTest3 $graph axis x -titlealternate yes $dops
-bltTest3 $graph axis x -titlecolor yellow $dops
-bltTest3 $graph axis x -titlefont {times 24 bold italic} $dops
+bltTest3 $bltgr axis y -activeforeground red $dops
+bltTest3 $bltgr axis y -activerelief sunken $dops
+#bltTest3 $bltgr axis x -autorange 10 $dops
+bltTest3 $bltgr axis x -background yellow $dops
+bltTest3 $bltgr axis x -bg blue $dops
+bltTest3 $bltgr axis x -bindtags {aa} 0
+bltTest3 $bltgr axis y -bd 4 $dops
+bltTest3 $bltgr axis y -borderwidth 4 $dops
+#bltTest3 $bltgr axis x -checklimits $dops
+bltTest3 $bltgr axis x -color red $dops
+#bltTest3 $bltgr axis x -command $dops
+bltTest3 $bltgr axis x -descending yes $dops
+bltTest3 $bltgr axis x -exterior no $dops
+bltTest3 $bltgr axis x -fg magenta $dops
+bltTest3 $bltgr axis x -foreground yellow $dops
+bltTest3 $bltgr axis x -grid no $dops
+bltTest3 $bltgr axis x -gridcolor blue $dops
+bltTest3 $bltgr axis x -griddashes {8 3} $dops
+bltTest3 $bltgr axis x -gridlinewidth 2 $dops
+bltTest3 $bltgr axis x -gridminor no $dops
+bltTest3 $bltgr axis x -gridminorcolor blue $dops
+bltTest3 $bltgr axis x -gridminordashes {8 3} $dops
+bltTest3 $bltgr axis x -gridminorlinewidth 2 $dops
+bltTest3 $bltgr axis x -hide yes $dops
+bltTest3 $bltgr axis x -justify left $dops
+bltTest3 $bltgr axis x -justify center $dops
+bltTest3 $bltgr axis x -justify right $dops
+bltTest3 $bltgr axis x -labeloffset yes $dops
+bltTest3 $bltgr axis x -limitscolor red $dops
+bltTest3 $bltgr axis x -limitsfont {times 18 bold italic} $dops
+bltTest3 $bltgr axis x -limitsformat "%e" $dops
+bltTest3 $bltgr axis x -linewidth 2 $dops
+bltTest3 $bltgr axis x -logscale yes $dops
+#bltTest3 $bltgr axis x -loosemin $dops
+#bltTest3 $bltgr axis x -loosemax $dops
+#bltTest3 $bltgr axis x -majorticks $dops
+#bltTest3 $bltgr axis x -max $dops
+#bltTest3 $bltgr axis x -min $dops
+#bltTest3 $bltgr axis x -minorticks $dops
+bltTest3 $bltgr axis x -relief flat $dops
+bltTest3 $bltgr axis x -relief groove $dops
+bltTest3 $bltgr axis x -relief raised $dops
+bltTest3 $bltgr axis x -relief ridge $dops
+bltTest3 $bltgr axis x -relief solid $dops
+bltTest3 $bltgr axis x -relief sunken $dops
+bltTest3 $bltgr axis x -rotate 45 $dops
+#bltTest3 $bltgr axis x -scrollcommand $dops
+#bltTest3 $bltgr axis x -scrollincrement $dops
+#bltTest3 $bltgr axis x -scrollmax $dops
+#bltTest3 $bltgr axis x -scrollmin $dops
+##bltTest3 $bltgr axis x -shiftby 10 $dops
+bltTest3 $bltgr axis x -showticks no $dops
+bltTest3 $bltgr axis x -stepsize 10 $dops
+bltTest3 $bltgr axis x -subdivisions 4 $dops
+##bltTest3 $bltgr axis x -tickanchor n $dops
+bltTest3 $bltgr axis x -tickfont {times 12 bold italic} $dops
+bltTest3 $bltgr axis x -ticklength 20 $dops
+bltTest3 $bltgr axis x -tickdefault 10 $dops
+bltTest3 $bltgr axis x -title {This is a Title} $dops
+bltTest3 $bltgr axis x -titlealternate yes $dops
+bltTest3 $bltgr axis x -titlecolor yellow $dops
+bltTest3 $bltgr axis x -titlefont {times 24 bold italic} $dops
 
-#bltCmd $graph axis activate foo
-#bltCmd $graph axis bind x
-bltCmd $graph axis cget x -color
-bltCmd $graph axis configure x
-bltCmd $graph axis configure x -color
-#bltCmd $graph axis create foo
-#bltCmd $graph axis deactivate foo
-#bltCmd $graph axis delete foo
-#bltCmd $graph axis invtransform x
-#bltCmd $graph axis limits x
-#bltCmd $graph axis margin x
-#bltCmd $graph axis names x
-#bltCmd $graph axis transform x
-#bltCmd $graph axis type x
-#bltCmd $graph axis view x
+#bltCmd $bltgr axis activate foo
+#bltCmd $bltgr axis bind x
+bltCmd $bltgr axis cget x -color
+bltCmd $bltgr axis configure x
+bltCmd $bltgr axis configure x -color
+#bltCmd $bltgr axis create foo
+#bltCmd $bltgr axis deactivate foo
+#bltCmd $bltgr axis delete foo
+#bltCmd $bltgr axis invtransform x
+#bltCmd $bltgr axis limits x
+#bltCmd $bltgr axis margin x
+#bltCmd $bltgr axis names x
+#bltCmd $bltgr axis transform x
+#bltCmd $bltgr axis type x
+#bltCmd $bltgr axis view x
 
-#bltCmd $graph xaxis activate
-#bltCmd $graph xaxis bind
-bltCmd $graph xaxis cget -color
-bltCmd $graph xaxis configure
-bltCmd $graph xaxis configure -color
-#bltCmd $graph xaxis deactivate
-#bltCmd $graph xaxis invtransform
-#bltCmd $graph xaxis limits
-#bltCmd $graph xaxis transform
-#bltCmd $graph xaxis use
-#bltCmd $graph xaxis view
+#bltCmd $bltgr xaxis activate
+#bltCmd $bltgr xaxis bind
+bltCmd $bltgr xaxis cget -color
+bltCmd $bltgr xaxis configure
+bltCmd $bltgr xaxis configure -color
+#bltCmd $bltgr xaxis deactivate
+#bltCmd $bltgr xaxis invtransform
+#bltCmd $bltgr xaxis limits
+#bltCmd $bltgr xaxis transform
+#bltCmd $bltgr xaxis use
+#bltCmd $bltgr xaxis view
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/barelement.tcl b/tests/barelement.tcl
index 5b8cb07..e31bafa 100644
--- a/tests/barelement.tcl
+++ b/tests/barelement.tcl
@@ -1,96 +1,96 @@
 source base.tcl
 
 set w .bar
-set graph [bltBarGraph $w]
+set bltgr [bltBarGraph $w]
 
-$graph element configure data1 -color red -showvalues y 
-$graph element configure data2 -color blue
+$bltgr element configure data1 -color red -showvalues y 
+$bltgr element configure data2 -color blue
 
-$graph pen create foo -showvalues y -color purple
-$graph element activate data3
+$bltgr pen create foo -showvalues y -color purple
+$bltgr element activate data3
 
 puts stderr "Testing Bar Element..."
 
-bltTest3 $graph element data3 -activepen foo $dops
-bltTest3 $graph element data2 -background yellow $dops
-bltTest3 $graph element data2 -barwidth 1 $dops
-bltTest3 $graph element data2 -bd 4 $dops
-bltTest3 $graph element data2 -bg yellow $dops
-bltTest3 $graph element data2 -bindtags {aa} 0
-bltTest3 $graph element data2 -borderwidth 4 $dops
-bltTest3 $graph element data2 -color yellow $dops
-bltTest3 $graph element data1 -data {0.2 8 0.4 20 0.6 31 0.8 41 1.0 50 1.2 59 1.4 65 1.6 70 1.8 75 2.0 85} $dops
-bltTest3 $graph element data2 -errorbarcolor green $dops
-bltTest3 $graph element data2 -errorbarwidth 2 $dops
-bltTest3 $graph element data2 -errorbarcap 10 $dops
-bltTest3 $graph element data2 -fg yellow $dops
-bltTest3 $graph element data1 -fill cyan $dops
-bltTest3 $graph element data2 -foreground green $dops
-bltTest3 $graph element data2 -hide yes $dops
-bltTest3 $graph element data2 -label "This is a test" $dops
-bltTest3 $graph element data2 -legendrelief groove $dops
-bltTest3 $graph element data2 -mapx x2 $dops
-bltTest3 $graph element data2 -mapy y2 $dops
-bltTest3 $graph element data1 -outline red $dops
-bltTest3 $graph element data2 -pen foo $dops
-bltTest3 $graph element data2 -relief flat $dops
-bltTest3 $graph element data2 -relief groove $dops
-bltTest3 $graph element data2 -relief raised $dops
-bltTest3 $graph element data2 -relief ridge $dops
-bltTest3 $graph element data2 -relief solid $dops
-bltTest3 $graph element data2 -relief sunken $dops
-bltTest3 $graph element data2 -showerrorbars no $dops
-bltTest3 $graph element data1 -showvalues none $dops
-bltTest3 $graph element data1 -showvalues x $dops
-bltTest3 $graph element data1 -showvalues both $dops
-#bltTest3 $graph element data2 -stack $dops
-#bltTest3 $graph element data2 -styles $dops
-bltTest3 $graph element data1 -valueanchor nw $dops
-bltTest3 $graph element data1 -valueanchor n $dops
-bltTest3 $graph element data1 -valueanchor ne $dops
-bltTest3 $graph element data1 -valueanchor e $dops
-bltTest3 $graph element data1 -valueanchor se $dops
-bltTest3 $graph element data1 -valueanchor s $dops
-bltTest3 $graph element data1 -valueanchor sw $dops
-bltTest3 $graph element data1 -valueanchor w $dops
-bltTest3 $graph element data1 -valuecolor cyan $dops
-bltTest3 $graph element data1 -valuefont {times 18 bold italic} $dops
-bltTest3 $graph element data1 -valueformat "%e" $dops
-bltTest3 $graph element data1 -valuerotate 45 $dops
-#bltTest3 $graph element data2 -weights $dops
-bltTest3 $graph element data1 -x {0 .2 .4 .6 .8 1 1.2 1.4 1.6 1.8} $dops
-bltTest3 $graph element data1 -xdata {0 .2 .4 .6 .8 1 1.2 1.4 1.6 1.8} $dops
-bltTest3 $graph element data2 -xerror {.1 .1 .1 .1 .1 .1 .1 .1 .1 .1 .1} $dops
-#bltTest3 $graph element data2 -xhigh $dops
-#bltTest3 $graph element data2 -xlow $dops
-bltTest3 $graph element data1 -y {8 20 31 41 50 59 65 70 75 85}  $dops
-bltTest3 $graph element data1 -ydata {8 20 31 41 50 59 65 70 75 85} $dops
-bltTest3 $graph element data2 -yerror {5 5 5 5 5 5 5 5 5 5 5} $dops
-#bltTest3 $graph element data2 -yhigh $dops
-#bltTest3 $graph element data2 -ylow $dops
+bltTest3 $bltgr element data3 -activepen foo $dops
+bltTest3 $bltgr element data2 -background yellow $dops
+bltTest3 $bltgr element data2 -barwidth 1 $dops
+bltTest3 $bltgr element data2 -bd 4 $dops
+bltTest3 $bltgr element data2 -bg yellow $dops
+bltTest3 $bltgr element data2 -bindtags {aa} 0
+bltTest3 $bltgr element data2 -borderwidth 4 $dops
+bltTest3 $bltgr element data2 -color yellow $dops
+bltTest3 $bltgr element data1 -data {0.2 8 0.4 20 0.6 31 0.8 41 1.0 50 1.2 59 1.4 65 1.6 70 1.8 75 2.0 85} $dops
+bltTest3 $bltgr element data2 -errorbarcolor green $dops
+bltTest3 $bltgr element data2 -errorbarwidth 2 $dops
+bltTest3 $bltgr element data2 -errorbarcap 10 $dops
+bltTest3 $bltgr element data2 -fg yellow $dops
+bltTest3 $bltgr element data1 -fill cyan $dops
+bltTest3 $bltgr element data2 -foreground green $dops
+bltTest3 $bltgr element data2 -hide yes $dops
+bltTest3 $bltgr element data2 -label "This is a test" $dops
+bltTest3 $bltgr element data2 -legendrelief groove $dops
+bltTest3 $bltgr element data2 -mapx x2 $dops
+bltTest3 $bltgr element data2 -mapy y2 $dops
+bltTest3 $bltgr element data1 -outline red $dops
+bltTest3 $bltgr element data2 -pen foo $dops
+bltTest3 $bltgr element data2 -relief flat $dops
+bltTest3 $bltgr element data2 -relief groove $dops
+bltTest3 $bltgr element data2 -relief raised $dops
+bltTest3 $bltgr element data2 -relief ridge $dops
+bltTest3 $bltgr element data2 -relief solid $dops
+bltTest3 $bltgr element data2 -relief sunken $dops
+bltTest3 $bltgr element data2 -showerrorbars no $dops
+bltTest3 $bltgr element data1 -showvalues none $dops
+bltTest3 $bltgr element data1 -showvalues x $dops
+bltTest3 $bltgr element data1 -showvalues both $dops
+#bltTest3 $bltgr element data2 -stack $dops
+#bltTest3 $bltgr element data2 -styles $dops
+bltTest3 $bltgr element data1 -valueanchor nw $dops
+bltTest3 $bltgr element data1 -valueanchor n $dops
+bltTest3 $bltgr element data1 -valueanchor ne $dops
+bltTest3 $bltgr element data1 -valueanchor e $dops
+bltTest3 $bltgr element data1 -valueanchor se $dops
+bltTest3 $bltgr element data1 -valueanchor s $dops
+bltTest3 $bltgr element data1 -valueanchor sw $dops
+bltTest3 $bltgr element data1 -valueanchor w $dops
+bltTest3 $bltgr element data1 -valuecolor cyan $dops
+bltTest3 $bltgr element data1 -valuefont {times 18 bold italic} $dops
+bltTest3 $bltgr element data1 -valueformat "%e" $dops
+bltTest3 $bltgr element data1 -valuerotate 45 $dops
+#bltTest3 $bltgr element data2 -weights $dops
+bltTest3 $bltgr element data1 -x {0 .2 .4 .6 .8 1 1.2 1.4 1.6 1.8} $dops
+bltTest3 $bltgr element data1 -xdata {0 .2 .4 .6 .8 1 1.2 1.4 1.6 1.8} $dops
+bltTest3 $bltgr element data2 -xerror {.1 .1 .1 .1 .1 .1 .1 .1 .1 .1 .1} $dops
+#bltTest3 $bltgr element data2 -xhigh $dops
+#bltTest3 $bltgr element data2 -xlow $dops
+bltTest3 $bltgr element data1 -y {8 20 31 41 50 59 65 70 75 85}  $dops
+bltTest3 $bltgr element data1 -ydata {8 20 31 41 50 59 65 70 75 85} $dops
+bltTest3 $bltgr element data2 -yerror {5 5 5 5 5 5 5 5 5 5 5} $dops
+#bltTest3 $bltgr element data2 -yhigh $dops
+#bltTest3 $bltgr element data2 -ylow $dops
 
-bltCmd $graph element activate data2
-bltCmd $graph element deactivate data2
-#bltCmd $graph element bind data1 <Button-1> [list puts "%x %y"]
-bltCmd $graph element cget data1 -showvalues
-bltCmd $graph element configure data1
-bltCmd $graph element configure data1 -showvalues
-#bltCmd $graph element closest 50 50
-#bltCmd $graph element closest 50 50 data1 data2
-bltCmd $graph element create data4
-bltCmd $graph element create data5
-bltCmd $graph element delete data4 data5
-bltCmd $graph element exists data1
-bltCmd $graph element lower data1
-bltCmd $graph element lower data2 data3
-bltCmd $graph element names
-bltCmd $graph element names data1
-bltCmd $graph element raise data2
-bltCmd $graph element raise data2 data3
-bltCmd $graph element raise data1
-bltCmd $graph element show data2
-bltCmd $graph element show {data1 data2 data3}
-bltCmd $graph element type data1
+bltCmd $bltgr element activate data2
+bltCmd $bltgr element deactivate data2
+#bltCmd $bltgr element bind data1 <Button-1> [list puts "%x %y"]
+bltCmd $bltgr element cget data1 -showvalues
+bltCmd $bltgr element configure data1
+bltCmd $bltgr element configure data1 -showvalues
+#bltCmd $bltgr element closest 50 50
+#bltCmd $bltgr element closest 50 50 data1 data2
+bltCmd $bltgr element create data4
+bltCmd $bltgr element create data5
+bltCmd $bltgr element delete data4 data5
+bltCmd $bltgr element exists data1
+bltCmd $bltgr element lower data1
+bltCmd $bltgr element lower data2 data3
+bltCmd $bltgr element names
+bltCmd $bltgr element names data1
+bltCmd $bltgr element raise data2
+bltCmd $bltgr element raise data2 data3
+bltCmd $bltgr element raise data1
+bltCmd $bltgr element show data2
+bltCmd $bltgr element show {data1 data2 data3}
+bltCmd $bltgr element type data1
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/bargraph.tcl b/tests/bargraph.tcl
index 20f067d..ec2fb57 100644
--- a/tests/bargraph.tcl
+++ b/tests/bargraph.tcl
@@ -1,79 +1,78 @@
 source base.tcl
 
 set w .bar
-set graph [bltBarGraph $w]
+set bltgr [bltBarGraph $w]
 
 puts stderr "Testing Bar Graph..."
 
-# Graph
-bltTest $graph -aspect 2 $dops
-bltTest $graph -background red $dops
-bltTest $graph -barmode stacked $dops
-bltTest $graph -barmode aligned $dops
-bltTest $graph -barmode overlap $dops
-bltTest $graph -barwidth .15 $dops
-#bltTest $graph -baseline $dops
-bltTest $graph -bd 50 $dops
-bltTest $graph -bg green $dops
-bltTest $graph -bm 50 $dops
-bltTest $graph -borderwidth 50 $dops
-bltTest $graph -bottommargin 50 $dops
-#bltTest $graph -bufferelements $dops
-#bltTest $graph -buffergraph $dops
-bltTest $graph -cursor cross $dops
-bltTest $graph -fg blue $dops
-bltTest $graph -font {times 36 bold italic} $dops
-bltTest $graph -foreground cyan $dops
-#bltTest $graph -halo $dops
-bltTest $graph -height 300 $dops
-#bltTest $graph -highlightbackground $dops
-#bltTest $graph -highlightcolor $dops
-#bltTest $graph -highlightthickness $dops
-bltTest $graph -invertxy yes $dops
-bltTest $graph -justify left $dops
-bltTest $graph -justify center $dops
-bltTest $graph -justify right $dops
-bltTest $graph -leftmargin 50 $dops
-bltTest $graph -lm 50 $dops
-bltTest $graph -plotbackground cyan $dops
-bltTest $graph -plotborderwidth 50 $dops
-bltTest $graph -plotpadx 50 $dops
-bltTest $graph -plotpady 50 $dops
-bltTest $graph -plotrelief groove $dops
-bltTest $graph -relief groove $dops
-bltTest $graph -rightmargin 50 $dops
-bltTest $graph -rm 50 $dops
-#bltTest $graph -searchhalo $dops
-#bltTest $graph -searchmode $dops
-#bltTest $graph -searchalong $dops
-#bltTest $graph -stackaxes $dops
-#bltTest $graph -takefocus $dops
-bltTest $graph -title "This is a Title" $dops
-bltTest $graph -tm 50 $dops
-bltTest $graph -topmargin 50 $dops
-bltTest $graph -width 300 $dops
-bltTest $graph -plotwidth 300 $dops
-bltTest $graph -plotheight 300 $dops
+bltTest $bltgr -aspect 2 $dops
+bltTest $bltgr -background red $dops
+bltTest $bltgr -barmode stacked $dops
+bltTest $bltgr -barmode aligned $dops
+bltTest $bltgr -barmode overlap $dops
+bltTest $bltgr -barwidth .15 $dops
+#bltTest $bltgr -baseline $dops
+bltTest $bltgr -bd 50 $dops
+bltTest $bltgr -bg green $dops
+bltTest $bltgr -bm 50 $dops
+bltTest $bltgr -borderwidth 50 $dops
+bltTest $bltgr -bottommargin 50 $dops
+#bltTest $bltgr -bufferelements $dops
+#bltTest $bltgr -buffergraph $dops
+bltTest $bltgr -cursor cross $dops
+bltTest $bltgr -fg blue $dops
+bltTest $bltgr -font {times 36 bold italic} $dops
+bltTest $bltgr -foreground cyan $dops
+#bltTest $bltgr -halo $dops
+bltTest $bltgr -height 300 $dops
+#bltTest $bltgr -highlightbackground $dops
+#bltTest $bltgr -highlightcolor $dops
+#bltTest $bltgr -highlightthickness $dops
+bltTest $bltgr -invertxy yes $dops
+bltTest $bltgr -justify left $dops
+bltTest $bltgr -justify center $dops
+bltTest $bltgr -justify right $dops
+bltTest $bltgr -leftmargin 50 $dops
+bltTest $bltgr -lm 50 $dops
+bltTest $bltgr -plotbackground cyan $dops
+bltTest $bltgr -plotborderwidth 50 $dops
+bltTest $bltgr -plotpadx 50 $dops
+bltTest $bltgr -plotpady 50 $dops
+bltTest $bltgr -plotrelief groove $dops
+bltTest $bltgr -relief groove $dops
+bltTest $bltgr -rightmargin 50 $dops
+bltTest $bltgr -rm 50 $dops
+#bltTest $bltgr -searchhalo $dops
+#bltTest $bltgr -searchmode $dops
+#bltTest $bltgr -searchalong $dops
+#bltTest $bltgr -stackaxes $dops
+#bltTest $bltgr -takefocus $dops
+bltTest $bltgr -title "This is a Title" $dops
+bltTest $bltgr -tm 50 $dops
+bltTest $bltgr -topmargin 50 $dops
+bltTest $bltgr -width 300 $dops
+bltTest $bltgr -plotwidth 300 $dops
+bltTest $bltgr -plotheight 300 $dops
 
-##bltCmd $graph axis
-bltCmd $graph cget -background
-bltCmd $graph configure 
-bltCmd $graph configure 
-bltCmd $graph configure -background cyan
-##bltCmd $graph crosshairs
-##bltCmd $graph element
-#bltCmd $graph extents
-#bltCmd $graph inside
-#bltCmd $graph invtransform
-##bltCmd $graph legend
-##bltCmd $graph marker
-##bltCmd $graph pen
-##bltCmd $graph postscript
-#bltCmd $graph transform
-##bltCmd $graph x2axis
-##bltCmd $graph xaxis
-##bltCmd $graph y2axis
-##bltCmd $graph yaxis
+##bltCmd $bltgr axis
+bltCmd $bltgr cget -background
+bltCmd $bltgr configure 
+bltCmd $bltgr configure 
+bltCmd $bltgr configure -background cyan
+##bltCmd $bltgr crosshairs
+##bltCmd $bltgr element
+#bltCmd $bltgr extents
+#bltCmd $bltgr inside
+#bltCmd $bltgr invtransform
+##bltCmd $bltgr legend
+##bltCmd $bltgr marker
+##bltCmd $bltgr pen
+##bltCmd $bltgr postscript
+#bltCmd $bltgr transform
+##bltCmd $bltgr x2axis
+##bltCmd $bltgr xaxis
+##bltCmd $bltgr y2axis
+##bltCmd $bltgr yaxis
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/barpen.tcl b/tests/barpen.tcl
index d06928b..6f77889 100644
--- a/tests/barpen.tcl
+++ b/tests/barpen.tcl
@@ -1,50 +1,50 @@
 source base.tcl
 
 set w .bar
-set graph [bltBarGraph $w]
+set bltgr [bltBarGraph $w]
 
-$graph pen create foo -color red -showvalues y
-$graph element configure data2 -pen foo
+$bltgr pen create foo -color red -showvalues y
+$bltgr element configure data2 -pen foo
 
 puts stderr "Testing Bar Pen..."
 
-bltTest3 $graph pen foo -background yellow $dops
-bltTest3 $graph pen foo -bd 4 $dops
-bltTest3 $graph pen foo -bg yellow $dops
-bltTest3 $graph pen foo -borderwidth 4 $dops
-bltTest3 $graph pen foo -color yellow $dops
-bltTest3 $graph pen foo -errorbarcolor green $dops
-bltTest3 $graph pen foo -errorbarwidth 2 $dops
-bltTest3 $graph pen foo -errorbarcap 10 $dops
-bltTest3 $graph pen foo -fg yellow $dops
-bltTest3 $graph pen foo -fill cyan $dops
-bltTest3 $graph pen foo -foreground green $dops
-bltTest3 $graph pen foo -outline red $dops
-bltTest3 $graph pen foo -relief flat $dops
-bltTest3 $graph pen foo -showerrorbars no $dops
-bltTest3 $graph pen foo -showvalues none $dops
-bltTest3 $graph pen foo -showvalues x $dops
-bltTest3 $graph pen foo -showvalues both $dops
-bltTest3 $graph pen foo -valueanchor nw $dops
-bltTest3 $graph pen foo -valueanchor n $dops
-bltTest3 $graph pen foo -valueanchor ne $dops
-bltTest3 $graph pen foo -valueanchor e $dops
-bltTest3 $graph pen foo -valueanchor se $dops
-bltTest3 $graph pen foo -valueanchor s $dops
-bltTest3 $graph pen foo -valueanchor sw $dops
-bltTest3 $graph pen foo -valueanchor w $dops
-bltTest3 $graph pen foo -valuecolor cyan $dops
-bltTest3 $graph pen foo -valuefont {times 18 bold italic} $dops
-bltTest3 $graph pen foo -valueformat "%e" $dops
-bltTest3 $graph pen foo -valuerotate 45 $dops
+bltTest3 $bltgr pen foo -background yellow $dops
+bltTest3 $bltgr pen foo -bd 4 $dops
+bltTest3 $bltgr pen foo -bg yellow $dops
+bltTest3 $bltgr pen foo -borderwidth 4 $dops
+bltTest3 $bltgr pen foo -color yellow $dops
+bltTest3 $bltgr pen foo -errorbarcolor green $dops
+bltTest3 $bltgr pen foo -errorbarwidth 2 $dops
+bltTest3 $bltgr pen foo -errorbarcap 10 $dops
+bltTest3 $bltgr pen foo -fg yellow $dops
+bltTest3 $bltgr pen foo -fill cyan $dops
+bltTest3 $bltgr pen foo -foreground green $dops
+bltTest3 $bltgr pen foo -outline red $dops
+bltTest3 $bltgr pen foo -relief flat $dops
+bltTest3 $bltgr pen foo -showerrorbars no $dops
+bltTest3 $bltgr pen foo -showvalues none $dops
+bltTest3 $bltgr pen foo -showvalues x $dops
+bltTest3 $bltgr pen foo -showvalues both $dops
+bltTest3 $bltgr pen foo -valueanchor nw $dops
+bltTest3 $bltgr pen foo -valueanchor n $dops
+bltTest3 $bltgr pen foo -valueanchor ne $dops
+bltTest3 $bltgr pen foo -valueanchor e $dops
+bltTest3 $bltgr pen foo -valueanchor se $dops
+bltTest3 $bltgr pen foo -valueanchor s $dops
+bltTest3 $bltgr pen foo -valueanchor sw $dops
+bltTest3 $bltgr pen foo -valueanchor w $dops
+bltTest3 $bltgr pen foo -valuecolor cyan $dops
+bltTest3 $bltgr pen foo -valuefont {times 18 bold italic} $dops
+bltTest3 $bltgr pen foo -valueformat "%e" $dops
+bltTest3 $bltgr pen foo -valuerotate 45 $dops
 
-bltCmd $graph pen cget foo -color
-bltCmd $graph pen configure foo
-bltCmd $graph pen configure foo -color
-bltCmd $graph pen create bar
-bltCmd $graph pen delete bar
-bltCmd $graph pen names 
-bltCmd $graph pen type foo
+bltCmd $bltgr pen cget foo -color
+bltCmd $bltgr pen configure foo
+bltCmd $bltgr pen configure foo -color
+bltCmd $bltgr pen create bar
+bltCmd $bltgr pen delete bar
+bltCmd $bltgr pen names 
+bltCmd $bltgr pen type foo
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/crosshairs.tcl b/tests/crosshairs.tcl
index c63cea5..ad6246e 100644
--- a/tests/crosshairs.tcl
+++ b/tests/crosshairs.tcl
@@ -1,25 +1,25 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-$graph crosshairs on
-$graph crosshairs configure -x 200 -y 200
+$bltgr crosshairs on
+$bltgr crosshairs configure -x 200 -y 200
 
 puts stderr "Testing Crosshairs..."
 
-bltTest2 $graph crosshairs -color green
-bltTest2 $graph crosshairs -dashes "8 3"
-bltTest2 $graph crosshairs -linewidth 3
-bltTest2 $graph crosshairs -x 100
-bltTest2 $graph crosshairs -y 100
+bltTest2 $bltgr crosshairs -color green
+bltTest2 $bltgr crosshairs -dashes "8 3"
+bltTest2 $bltgr crosshairs -linewidth 3
+bltTest2 $bltgr crosshairs -x 100
+bltTest2 $bltgr crosshairs -y 100
 
-bltCmd $graph crosshairs cget -color
-bltCmd $graph crosshairs configure
-bltCmd $graph crosshairs configure -color
-bltCmd $graph crosshairs on
-bltCmd $graph crosshairs off
-bltCmd $graph crosshairs toggle
+bltCmd $bltgr crosshairs cget -color
+bltCmd $bltgr crosshairs configure
+bltCmd $bltgr crosshairs configure -color
+bltCmd $bltgr crosshairs on
+bltCmd $bltgr crosshairs off
+bltCmd $bltgr crosshairs toggle
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/legend.tcl b/tests/legend.tcl
index dba8da0..98597bd 100644
--- a/tests/legend.tcl
+++ b/tests/legend.tcl
@@ -1,100 +1,100 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-$graph legend selection set data2
-$graph legend focus data1
-$graph legend configure -selectrelief groove
+$bltgr legend selection set data2
+$bltgr legend focus data1
+$bltgr legend configure -selectrelief groove
 
 puts stderr "Testing Legend..."
 
-#bltTest2 $graph legend -activebackground $dops
-#bltTest2 $graph legend -activeborderwidth $dops
-#bltTest2 $graph legend -activeforeground $dops
-#bltTest2 $graph legend -activerelief $dops
-bltTest2 $graph legend -anchor nw $dops
-bltTest2 $graph legend -anchor n $dops
-bltTest2 $graph legend -anchor ne $dops
-bltTest2 $graph legend -anchor e $dops
-bltTest2 $graph legend -anchor se $dops
-bltTest2 $graph legend -anchor s $dops
-bltTest2 $graph legend -anchor sw $dops
-bltTest2 $graph legend -anchor w $dops
-bltTest2 $graph legend -bg pink $dops
-bltTest2 $graph legend -background cyan $dops
-bltTest2 $graph legend -borderwidth 20 $dops
-bltTest2 $graph legend -bd 20 $dops
-bltTest2 $graph legend -columns 2 $dops
-#bltTest2 $graph legend -exportselection $dops
-bltTest2 $graph legend -focusdashes "8 3" $dops
-bltTest2 $graph legend -focusforeground red $dops
-bltTest2 $graph legend -font {times 18 bold italic} $dops
-bltTest2 $graph legend -fg yellow $dops
-bltTest2 $graph legend -foreground purple $dops
-bltTest2 $graph legend -hide yes $dops
-bltTest2 $graph legend -ipadx 20 $dops
-bltTest2 $graph legend -ipady 20 $dops
-#bltTest2 $graph legend -nofocusselectbackground $dops
-#bltTest2 $graph legend -nofocusselectforeground $dops
-bltTest2 $graph legend -padx 20 $dops
-bltTest2 $graph legend -pady 20 $dops
-bltTest2 $graph legend -position rightmargin $dops
-bltTest2 $graph legend -position leftmargin $dops
-bltTest2 $graph legend -position topmargin $dops
-bltTest2 $graph legend -position bottommargin $dops
-bltTest2 $graph legend -position plotarea $dops
-bltTest2 $graph legend -position xy $dops
-bltTest2 $graph legend -x 250 $dops
-bltTest2 $graph legend -y 100 $dops
-bltTest2 $graph legend -raised yes $dops
-bltTest2 $graph legend -relief flat $dops
-bltTest2 $graph legend -relief groove $dops
-bltTest2 $graph legend -relief raised $dops
-bltTest2 $graph legend -relief ridge $dops
-bltTest2 $graph legend -relief solid $dops
-bltTest2 $graph legend -relief sunken $dops
-bltTest2 $graph legend -rows 1 $dops
-#bltTest2 $graph legend -selectbackground $dops
-bltTest2 $graph legend -selectborderwidth 3 $dops
-#bltTest2 $graph legend -selectcommand $dops
-#bltTest2 $graph legend -selectforeground $dops
-#bltTest2 $graph legend -selectmode $dops
-bltTest2 $graph legend -selectrelief flat $dops
-bltTest2 $graph legend -title "Hello World" $dops
-bltTest2 $graph legend -titlecolor red $dops
-bltTest2 $graph legend -titlefont {times 24 bold italic} $dops
+#bltTest2 $bltgr legend -activebackground $dops
+#bltTest2 $bltgr legend -activeborderwidth $dops
+#bltTest2 $bltgr legend -activeforeground $dops
+#bltTest2 $bltgr legend -activerelief $dops
+bltTest2 $bltgr legend -anchor nw $dops
+bltTest2 $bltgr legend -anchor n $dops
+bltTest2 $bltgr legend -anchor ne $dops
+bltTest2 $bltgr legend -anchor e $dops
+bltTest2 $bltgr legend -anchor se $dops
+bltTest2 $bltgr legend -anchor s $dops
+bltTest2 $bltgr legend -anchor sw $dops
+bltTest2 $bltgr legend -anchor w $dops
+bltTest2 $bltgr legend -bg pink $dops
+bltTest2 $bltgr legend -background cyan $dops
+bltTest2 $bltgr legend -borderwidth 20 $dops
+bltTest2 $bltgr legend -bd 20 $dops
+bltTest2 $bltgr legend -columns 2 $dops
+#bltTest2 $bltgr legend -exportselection $dops
+bltTest2 $bltgr legend -focusdashes "8 3" $dops
+bltTest2 $bltgr legend -focusforeground red $dops
+bltTest2 $bltgr legend -font {times 18 bold italic} $dops
+bltTest2 $bltgr legend -fg yellow $dops
+bltTest2 $bltgr legend -foreground purple $dops
+bltTest2 $bltgr legend -hide yes $dops
+bltTest2 $bltgr legend -ipadx 20 $dops
+bltTest2 $bltgr legend -ipady 20 $dops
+#bltTest2 $bltgr legend -nofocusselectbackground $dops
+#bltTest2 $bltgr legend -nofocusselectforeground $dops
+bltTest2 $bltgr legend -padx 20 $dops
+bltTest2 $bltgr legend -pady 20 $dops
+bltTest2 $bltgr legend -position rightmargin $dops
+bltTest2 $bltgr legend -position leftmargin $dops
+bltTest2 $bltgr legend -position topmargin $dops
+bltTest2 $bltgr legend -position bottommargin $dops
+bltTest2 $bltgr legend -position plotarea $dops
+bltTest2 $bltgr legend -position xy $dops
+bltTest2 $bltgr legend -x 250 $dops
+bltTest2 $bltgr legend -y 100 $dops
+bltTest2 $bltgr legend -raised yes $dops
+bltTest2 $bltgr legend -relief flat $dops
+bltTest2 $bltgr legend -relief groove $dops
+bltTest2 $bltgr legend -relief raised $dops
+bltTest2 $bltgr legend -relief ridge $dops
+bltTest2 $bltgr legend -relief solid $dops
+bltTest2 $bltgr legend -relief sunken $dops
+bltTest2 $bltgr legend -rows 1 $dops
+#bltTest2 $bltgr legend -selectbackground $dops
+bltTest2 $bltgr legend -selectborderwidth 3 $dops
+#bltTest2 $bltgr legend -selectcommand $dops
+#bltTest2 $bltgr legend -selectforeground $dops
+#bltTest2 $bltgr legend -selectmode $dops
+bltTest2 $bltgr legend -selectrelief flat $dops
+bltTest2 $bltgr legend -title "Hello World" $dops
+bltTest2 $bltgr legend -titlecolor red $dops
+bltTest2 $bltgr legend -titlefont {times 24 bold italic} $dops
 
-#bltCmd $graph legend activate
-#bltCmd $graph legend bind
-bltCmd $graph legend cget -fg
-bltCmd $graph legend configure
-bltCmd $graph legend configure -fg
-#bltCmd $graph legend curselection
-#bltCmd $graph legend deactivate
-bltCmd $graph legend focus data1
-bltCmd $graph legend focus
-#bltCmd $graph legend get anchor
-#bltCmd $graph legend get current
-#bltCmd $graph legend get first
-#bltCmd $graph legend get last
-#bltCmd $graph legend get end
-#bltCmd $graph legend get next.row
-#bltCmd $graph legend get next.column
-#bltCmd $graph legend get previous.row
-#bltCmd $graph legend get previous.column
-#bltCmd $graph legend get @100,100
-#bltCmd $graph legend get data1
-bltCmd $graph legend selection anchor data1
-bltCmd $graph legend selection mark data1
-bltCmd $graph legend selection includes data2
-bltCmd $graph legend selection present
-bltCmd $graph legend selection set data1 data2
-bltCmd $graph legend selection clear data1 data2
-bltCmd $graph legend selection set data1 data2
-bltCmd $graph legend selection toggle data1 data2
-bltCmd $graph legend selection set data1 data2
-bltCmd $graph legend selection clearall
+#bltCmd $bltgr legend activate
+#bltCmd $bltgr legend bind
+bltCmd $bltgr legend cget -fg
+bltCmd $bltgr legend configure
+bltCmd $bltgr legend configure -fg
+#bltCmd $bltgr legend curselection
+#bltCmd $bltgr legend deactivate
+bltCmd $bltgr legend focus data1
+bltCmd $bltgr legend focus
+#bltCmd $bltgr legend get anchor
+#bltCmd $bltgr legend get current
+#bltCmd $bltgr legend get first
+#bltCmd $bltgr legend get last
+#bltCmd $bltgr legend get end
+#bltCmd $bltgr legend get next.row
+#bltCmd $bltgr legend get next.column
+#bltCmd $bltgr legend get previous.row
+#bltCmd $bltgr legend get previous.column
+#bltCmd $bltgr legend get @100,100
+#bltCmd $bltgr legend get data1
+bltCmd $bltgr legend selection anchor data1
+bltCmd $bltgr legend selection mark data1
+bltCmd $bltgr legend selection includes data2
+bltCmd $bltgr legend selection present
+bltCmd $bltgr legend selection set data1 data2
+bltCmd $bltgr legend selection clear data1 data2
+bltCmd $bltgr legend selection set data1 data2
+bltCmd $bltgr legend selection toggle data1 data2
+bltCmd $bltgr legend selection set data1 data2
+bltCmd $bltgr legend selection clearall
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/lineelement.tcl b/tests/lineelement.tcl
index 5edb38e..6c8403d 100644
--- a/tests/lineelement.tcl
+++ b/tests/lineelement.tcl
@@ -1,104 +1,104 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-$graph element configure data1 -dash {8 3} -showvalues y -smooth step -symbol circle -outline yellow -outlinewidth 3 -pixels 10
+$bltgr element configure data1 -dash {8 3} -showvalues y -smooth step -symbol circle -outline yellow -outlinewidth 3 -pixels 10
 
-$graph pen create foo -showvalues y -symbol circle -dashes {8 3} -color purple -linewidth 2
-$graph element activate data3
+$bltgr pen create foo -showvalues y -symbol circle -dashes {8 3} -color purple -linewidth 2
+$bltgr element activate data3
 
 puts stderr "Testing Line Element.."
 
-bltTest3 $graph element data3 -activepen foo $dops
-bltTest3 $graph element data2 -areabackground yellow $dops
-bltTest3 $graph element data2 -bindtags {aa}
-bltTest3 $graph element data2 -color yellow $dops
-bltTest3 $graph element data2 -dashes {8 3} $dops
-bltTest3 $graph element data1 -data {0.2 8 0.4 20 0.6 31 0.8 41 1.0 50 1.2 59 1.4 65 1.6 70 1.8 75 2.0 85} $dops
-bltTest3 $graph element data2 -errorbarcolor green $dops
-bltTest3 $graph element data2 -errorbarwidth 2 $dops
-bltTest3 $graph element data2 -errorbarcap 10 $dops
-bltTest3 $graph element data1 -fill cyan $dops
-bltTest3 $graph element data2 -hide yes $dops
-bltTest3 $graph element data2 -label "This is a test" $dops
-bltTest3 $graph element data2 -legendrelief groove $dops
-bltTest3 $graph element data2 -linewidth 3 $dops
-bltTest3 $graph element data2 -mapx x2 $dops
-bltTest3 $graph element data2 -mapy y2 $dops
-bltTest3 $graph element data1 -maxsymbols 4 $dops
-bltTest3 $graph element data1 -offdash black $dops
-bltTest3 $graph element data1 -outline green $dops
-bltTest3 $graph element data1 -outlinewidth 5 $dops
-bltTest3 $graph element data2 -pen foo $dops
-bltTest3 $graph element data1 -pixels 20 $dops
-#bltTest3 $graph element data2 -reduce $dops
-bltTest3 $graph element data1 -scalesymbols no $dops
-bltTest3 $graph element data2 -showerrorbars no $dops
-bltTest3 $graph element data1 -showvalues none $dops
-bltTest3 $graph element data1 -showvalues x $dops
-bltTest3 $graph element data1 -showvalues both $dops
-bltTest3 $graph element data1 -smooth linear $dops
-bltTest3 $graph element data1 -smooth cubic $dops
-bltTest3 $graph element data1 -smooth quadratic $dops
-bltTest3 $graph element data1 -smooth catrom $dops
-#bltTest3 $graph element data2 -styles $dops
-bltTest3 $graph element data1 -symbol arrow $dops
-bltTest3 $graph element data1 -symbol cross $dops
-bltTest3 $graph element data1 -symbol diamond $dops
-bltTest3 $graph element data1 -symbol none $dops
-bltTest3 $graph element data1 -symbol plus $dops
-bltTest3 $graph element data1 -symbol scross $dops
-bltTest3 $graph element data1 -symbol splus $dops
-bltTest3 $graph element data1 -symbol square $dops
-bltTest3 $graph element data1 -symbol triangle $dops
-bltTest3 $graph element data2 -trace both $dops
-bltTest3 $graph element data1 -valueanchor nw $dops
-bltTest3 $graph element data1 -valueanchor n $dops
-bltTest3 $graph element data1 -valueanchor ne $dops
-bltTest3 $graph element data1 -valueanchor e $dops
-bltTest3 $graph element data1 -valueanchor se $dops
-bltTest3 $graph element data1 -valueanchor s $dops
-bltTest3 $graph element data1 -valueanchor sw $dops
-bltTest3 $graph element data1 -valueanchor w $dops
-bltTest3 $graph element data1 -valuecolor cyan $dops
-bltTest3 $graph element data1 -valuefont {times 18 bold italic} $dops
-bltTest3 $graph element data1 -valueformat "%e" $dops
-bltTest3 $graph element data1 -valuerotate 45 $dops
-#bltTest3 $graph element data2 -weights $dops
-bltTest3 $graph element data1 -x {0 .2 .4 .6 .8 1 1.2 1.4 1.6 1.8} $dops
-bltTest3 $graph element data1 -xdata {0 .2 .4 .6 .8 1 1.2 1.4 1.6 1.8} $dops
-bltTest3 $graph element data2 -xerror {.1 .1 .1 .1 .1 .1 .1 .1 .1 .1 .1} $dops
-#bltTest3 $graph element data2 -xhigh $dops
-#bltTest3 $graph element data2 -xlow $dops
-bltTest3 $graph element data1 -y {8 20 31 41 50 59 65 70 75 85}  $dops
-bltTest3 $graph element data1 -ydata {8 20 31 41 50 59 65 70 75 85} $dops
-bltTest3 $graph element data2 -yerror {5 5 5 5 5 5 5 5 5 5 5} $dops
-#bltTest3 $graph element data2 -yhigh $dops
-#bltTest3 $graph element data2 -ylow $dops
+bltTest3 $bltgr element data3 -activepen foo $dops
+bltTest3 $bltgr element data2 -areabackground yellow $dops
+bltTest3 $bltgr element data2 -bindtags {aa}
+bltTest3 $bltgr element data2 -color yellow $dops
+bltTest3 $bltgr element data2 -dashes {8 3} $dops
+bltTest3 $bltgr element data1 -data {0.2 8 0.4 20 0.6 31 0.8 41 1.0 50 1.2 59 1.4 65 1.6 70 1.8 75 2.0 85} $dops
+bltTest3 $bltgr element data2 -errorbarcolor green $dops
+bltTest3 $bltgr element data2 -errorbarwidth 2 $dops
+bltTest3 $bltgr element data2 -errorbarcap 10 $dops
+bltTest3 $bltgr element data1 -fill cyan $dops
+bltTest3 $bltgr element data2 -hide yes $dops
+bltTest3 $bltgr element data2 -label "This is a test" $dops
+bltTest3 $bltgr element data2 -legendrelief groove $dops
+bltTest3 $bltgr element data2 -linewidth 3 $dops
+bltTest3 $bltgr element data2 -mapx x2 $dops
+bltTest3 $bltgr element data2 -mapy y2 $dops
+bltTest3 $bltgr element data1 -maxsymbols 4 $dops
+bltTest3 $bltgr element data1 -offdash black $dops
+bltTest3 $bltgr element data1 -outline green $dops
+bltTest3 $bltgr element data1 -outlinewidth 5 $dops
+bltTest3 $bltgr element data2 -pen foo $dops
+bltTest3 $bltgr element data1 -pixels 20 $dops
+#bltTest3 $bltgr element data2 -reduce $dops
+bltTest3 $bltgr element data1 -scalesymbols no $dops
+bltTest3 $bltgr element data2 -showerrorbars no $dops
+bltTest3 $bltgr element data1 -showvalues none $dops
+bltTest3 $bltgr element data1 -showvalues x $dops
+bltTest3 $bltgr element data1 -showvalues both $dops
+bltTest3 $bltgr element data1 -smooth linear $dops
+bltTest3 $bltgr element data1 -smooth cubic $dops
+bltTest3 $bltgr element data1 -smooth quadratic $dops
+bltTest3 $bltgr element data1 -smooth catrom $dops
+#bltTest3 $bltgr element data2 -styles $dops
+bltTest3 $bltgr element data1 -symbol arrow $dops
+bltTest3 $bltgr element data1 -symbol cross $dops
+bltTest3 $bltgr element data1 -symbol diamond $dops
+bltTest3 $bltgr element data1 -symbol none $dops
+bltTest3 $bltgr element data1 -symbol plus $dops
+bltTest3 $bltgr element data1 -symbol scross $dops
+bltTest3 $bltgr element data1 -symbol splus $dops
+bltTest3 $bltgr element data1 -symbol square $dops
+bltTest3 $bltgr element data1 -symbol triangle $dops
+bltTest3 $bltgr element data2 -trace both $dops
+bltTest3 $bltgr element data1 -valueanchor nw $dops
+bltTest3 $bltgr element data1 -valueanchor n $dops
+bltTest3 $bltgr element data1 -valueanchor ne $dops
+bltTest3 $bltgr element data1 -valueanchor e $dops
+bltTest3 $bltgr element data1 -valueanchor se $dops
+bltTest3 $bltgr element data1 -valueanchor s $dops
+bltTest3 $bltgr element data1 -valueanchor sw $dops
+bltTest3 $bltgr element data1 -valueanchor w $dops
+bltTest3 $bltgr element data1 -valuecolor cyan $dops
+bltTest3 $bltgr element data1 -valuefont {times 18 bold italic} $dops
+bltTest3 $bltgr element data1 -valueformat "%e" $dops
+bltTest3 $bltgr element data1 -valuerotate 45 $dops
+#bltTest3 $bltgr element data2 -weights $dops
+bltTest3 $bltgr element data1 -x {0 .2 .4 .6 .8 1 1.2 1.4 1.6 1.8} $dops
+bltTest3 $bltgr element data1 -xdata {0 .2 .4 .6 .8 1 1.2 1.4 1.6 1.8} $dops
+bltTest3 $bltgr element data2 -xerror {.1 .1 .1 .1 .1 .1 .1 .1 .1 .1 .1} $dops
+#bltTest3 $bltgr element data2 -xhigh $dops
+#bltTest3 $bltgr element data2 -xlow $dops
+bltTest3 $bltgr element data1 -y {8 20 31 41 50 59 65 70 75 85}  $dops
+bltTest3 $bltgr element data1 -ydata {8 20 31 41 50 59 65 70 75 85} $dops
+bltTest3 $bltgr element data2 -yerror {5 5 5 5 5 5 5 5 5 5 5} $dops
+#bltTest3 $bltgr element data2 -yhigh $dops
+#bltTest3 $bltgr element data2 -ylow $dops
 
-bltCmd $graph element activate data2
-bltCmd $graph element deactivate data2
-#bltCmd $graph element bind data1 <Button-1> [list puts "%x %y"]
-bltCmd $graph element cget data1 -smooth
-bltCmd $graph element configure data1
-bltCmd $graph element configure data1 -smooth
-#bltCmd $graph element closest 50 50
-#bltCmd $graph element closest 50 50 data1 data2
-bltCmd $graph element create data4
-bltCmd $graph element create data5
-bltCmd $graph element delete data4 data5
-bltCmd $graph element exists data1
-bltCmd $graph element lower data1
-bltCmd $graph element lower data2 data3
-bltCmd $graph element names
-bltCmd $graph element names data1
-bltCmd $graph element raise data2
-bltCmd $graph element raise data2 data3
-bltCmd $graph element raise data1
-bltCmd $graph element show data2
-bltCmd $graph element show {data1 data2 data3}
-bltCmd $graph element type data1
+bltCmd $bltgr element activate data2
+bltCmd $bltgr element deactivate data2
+#bltCmd $bltgr element bind data1 <Button-1> [list puts "%x %y"]
+bltCmd $bltgr element cget data1 -smooth
+bltCmd $bltgr element configure data1
+bltCmd $bltgr element configure data1 -smooth
+#bltCmd $bltgr element closest 50 50
+#bltCmd $bltgr element closest 50 50 data1 data2
+bltCmd $bltgr element create data4
+bltCmd $bltgr element create data5
+bltCmd $bltgr element delete data4 data5
+bltCmd $bltgr element exists data1
+bltCmd $bltgr element lower data1
+bltCmd $bltgr element lower data2 data3
+bltCmd $bltgr element names
+bltCmd $bltgr element names data1
+bltCmd $bltgr element raise data2
+bltCmd $bltgr element raise data2 data3
+bltCmd $bltgr element raise data1
+bltCmd $bltgr element show data2
+bltCmd $bltgr element show {data1 data2 data3}
+bltCmd $bltgr element type data1
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/linegraph.tcl b/tests/linegraph.tcl
index 6204e72..8f4a5fe 100644
--- a/tests/linegraph.tcl
+++ b/tests/linegraph.tcl
@@ -1,74 +1,74 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
 puts stderr "Testing Line Graph..."
 
-bltTest $graph -aspect 2 $dops
-bltTest $graph -background red $dops
-#bltTest $graph -baseline $dops
-bltTest $graph -bd 50 $dops
-bltTest $graph -bg green $dops
-bltTest $graph -bm 50 $dops
-bltTest $graph -borderwidth 50 $dops
-bltTest $graph -bottommargin 50 $dops
-#bltTest $graph -bufferelements $dops
-#bltTest $graph -buffergraph $dops
-bltTest $graph -cursor cross $dops
-bltTest $graph -fg blue $dops
-bltTest $graph -font {times 36 bold italic} $dops
-bltTest $graph -foreground cyan $dops
-#bltTest $graph -halo $dops
-bltTest $graph -height 300 $dops
-#bltTest $graph -highlightbackground $dops
-#bltTest $graph -highlightcolor $dops
-#bltTest $graph -highlightthickness $dops
-bltTest $graph -invertxy yes $dops
-bltTest $graph -justify left $dops
-bltTest $graph -justify center $dops
-bltTest $graph -justify right $dops
-bltTest $graph -leftmargin 50 $dops
-bltTest $graph -lm 50 $dops
-bltTest $graph -plotbackground cyan $dops
-bltTest $graph -plotborderwidth 50 $dops
-bltTest $graph -plotpadx 50 $dops
-bltTest $graph -plotpady 50 $dops
-bltTest $graph -plotrelief groove $dops
-bltTest $graph -relief groove $dops
-bltTest $graph -rightmargin 50 $dops
-bltTest $graph -rm 50 $dops
-#bltTest $graph -searchhalo $dops
-#bltTest $graph -searchmode $dops
-#bltTest $graph -searchalong $dops
-#bltTest $graph -stackaxes $dops
-#bltTest $graph -takefocus $dops
-bltTest $graph -title "This is a Title" $dops
-bltTest $graph -tm 50 $dops
-bltTest $graph -topmargin 50 $dops
-bltTest $graph -width 300 $dops
-bltTest $graph -plotwidth 300 $dops
-bltTest $graph -plotheight 300 $dops
+bltTest $bltgr -aspect 2 $dops
+bltTest $bltgr -background red $dops
+#bltTest $bltgr -baseline $dops
+bltTest $bltgr -bd 50 $dops
+bltTest $bltgr -bg green $dops
+bltTest $bltgr -bm 50 $dops
+bltTest $bltgr -borderwidth 50 $dops
+bltTest $bltgr -bottommargin 50 $dops
+#bltTest $bltgr -bufferelements $dops
+#bltTest $bltgr -buffergraph $dops
+bltTest $bltgr -cursor cross $dops
+bltTest $bltgr -fg blue $dops
+bltTest $bltgr -font {times 36 bold italic} $dops
+bltTest $bltgr -foreground cyan $dops
+#bltTest $bltgr -halo $dops
+bltTest $bltgr -height 300 $dops
+#bltTest $bltgr -highlightbackground $dops
+#bltTest $bltgr -highlightcolor $dops
+#bltTest $bltgr -highlightthickness $dops
+bltTest $bltgr -invertxy yes $dops
+bltTest $bltgr -justify left $dops
+bltTest $bltgr -justify center $dops
+bltTest $bltgr -justify right $dops
+bltTest $bltgr -leftmargin 50 $dops
+bltTest $bltgr -lm 50 $dops
+bltTest $bltgr -plotbackground cyan $dops
+bltTest $bltgr -plotborderwidth 50 $dops
+bltTest $bltgr -plotpadx 50 $dops
+bltTest $bltgr -plotpady 50 $dops
+bltTest $bltgr -plotrelief groove $dops
+bltTest $bltgr -relief groove $dops
+bltTest $bltgr -rightmargin 50 $dops
+bltTest $bltgr -rm 50 $dops
+#bltTest $bltgr -searchhalo $dops
+#bltTest $bltgr -searchmode $dops
+#bltTest $bltgr -searchalong $dops
+#bltTest $bltgr -stackaxes $dops
+#bltTest $bltgr -takefocus $dops
+bltTest $bltgr -title "This is a Title" $dops
+bltTest $bltgr -tm 50 $dops
+bltTest $bltgr -topmargin 50 $dops
+bltTest $bltgr -width 300 $dops
+bltTest $bltgr -plotwidth 300 $dops
+bltTest $bltgr -plotheight 300 $dops
 
-##bltCmd $graph axis
-bltCmd $graph cget -background
-bltCmd $graph configure 
-bltCmd $graph configure 
-bltCmd $graph configure -background cyan
-##bltCmd $graph crosshairs
-##bltCmd $graph element
-#bltCmd $graph extents
-#bltCmd $graph inside
-#bltCmd $graph invtransform
-##bltCmd $graph legend
-##bltCmd $graph marker
-##bltCmd $graph pen
-#bltCmd $graph postscript output foo.ps
-#bltCmd $graph transform
-##bltCmd $graph x2axis
-##bltCmd $graph xaxis
-##bltCmd $graph y2axis
-##bltCmd $graph yaxis
+##bltCmd $bltgr axis
+bltCmd $bltgr cget -background
+bltCmd $bltgr configure 
+bltCmd $bltgr configure 
+bltCmd $bltgr configure -background cyan
+##bltCmd $bltgr crosshairs
+##bltCmd $bltgr element
+#bltCmd $bltgr extents
+#bltCmd $bltgr inside
+#bltCmd $bltgr invtransform
+##bltCmd $bltgr legend
+##bltCmd $bltgr marker
+##bltCmd $bltgr pen
+#bltCmd $bltgr postscript output foo.ps
+#bltCmd $bltgr transform
+##bltCmd $bltgr x2axis
+##bltCmd $bltgr xaxis
+##bltCmd $bltgr y2axis
+##bltCmd $bltgr yaxis
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/linemarker.tcl b/tests/linemarker.tcl
index 3b66ba6..84e78a5 100644
--- a/tests/linemarker.tcl
+++ b/tests/linemarker.tcl
@@ -1,33 +1,33 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-set mm [$graph marker create line tt -element data2 \
+set mm [$bltgr marker create line tt -element data2 \
 	    -coords {1 50 1.5 100 1 150} -linewidth 5]
-set nn [$graph marker create line ss -element data2 \
+set nn [$bltgr marker create line ss -element data2 \
 	    -coords {1 150 .5 100 1 50} -linewidth 2 \
 	    -outline green -dashes 4]
-$graph element configure data1 -hide yes
+$bltgr element configure data1 -hide yes
 
 puts stderr "Testing Line Marker..."
 
-bltTest3 $graph marker $mm -bindtags {aa} 0
-bltTest3 $graph marker $mm -cap round $dops
-bltTest3 $graph marker $mm -coords {1 50 1.5 100 2 150} $dops
-bltTest3 $graph marker $mm -dashes {8 3} $dops
-bltTest3 $graph marker $nn -dashoffset 10 $dops
-bltTest3 $graph marker $mm -element data1 $dops
-bltTest3 $graph marker $nn -fill yellow $dops
-bltTest3 $graph marker $mm -join round $dops
-bltTest3 $graph marker $mm -linewidth 1 $dops
-bltTest3 $graph marker $mm -hide yes $dops
-bltTest3 $graph marker $mm -mapx x2 $dops
-bltTest3 $graph marker $mm -mapy y2 $dops
-bltTest3 $graph marker $mm -outline green $dops
-bltTest3 $graph marker $mm -under yes $dops
-bltTest3 $graph marker $mm -xoffset 20 $dops
-bltTest3 $graph marker $mm -yoffset 20 $dops
+bltTest3 $bltgr marker $mm -bindtags {aa} 0
+bltTest3 $bltgr marker $mm -cap round $dops
+bltTest3 $bltgr marker $mm -coords {1 50 1.5 100 2 150} $dops
+bltTest3 $bltgr marker $mm -dashes {8 3} $dops
+bltTest3 $bltgr marker $nn -dashoffset 10 $dops
+bltTest3 $bltgr marker $mm -element data1 $dops
+bltTest3 $bltgr marker $nn -fill yellow $dops
+bltTest3 $bltgr marker $mm -join round $dops
+bltTest3 $bltgr marker $mm -linewidth 1 $dops
+bltTest3 $bltgr marker $mm -hide yes $dops
+bltTest3 $bltgr marker $mm -mapx x2 $dops
+bltTest3 $bltgr marker $mm -mapy y2 $dops
+bltTest3 $bltgr marker $mm -outline green $dops
+bltTest3 $bltgr marker $mm -under yes $dops
+bltTest3 $bltgr marker $mm -xoffset 20 $dops
+bltTest3 $bltgr marker $mm -yoffset 20 $dops
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/linepen.tcl b/tests/linepen.tcl
index e47b243..ce36707 100644
--- a/tests/linepen.tcl
+++ b/tests/linepen.tcl
@@ -1,54 +1,54 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-$graph pen create foo -color red -showvalues y -symbol circle -dashes {4 4}
-$graph element configure data2 -pen foo
+$bltgr pen create foo -color red -showvalues y -symbol circle -dashes {4 4}
+$bltgr element configure data2 -pen foo
 
 puts stderr "Testing Line Pen..."
 
-bltTest3 $graph pen foo -color yellow $dops
-bltTest3 $graph pen foo -dashes {8 3} $dops
-bltTest3 $graph pen foo -errorbarcolor green $dops
-bltTest3 $graph pen foo -errorbarwidth 2 $dops
-bltTest3 $graph pen foo -errorbarcap 10 $dops
-bltTest3 $graph pen foo -fill cyan $dops
-bltTest3 $graph pen foo -linewidth 3 $dops
-bltTest3 $graph pen foo -offdash black $dops
-bltTest3 $graph pen foo -outline green $dops
-bltTest3 $graph pen foo -outlinewidth 5 $dops
-bltTest3 $graph pen foo -pixels 20 $dops
-bltTest3 $graph pen foo -showvalues none $dops
-bltTest3 $graph pen foo -symbol arrow $dops
-bltTest3 $graph pen foo -symbol cross $dops
-bltTest3 $graph pen foo -symbol diamond $dops
-bltTest3 $graph pen foo -symbol none $dops
-bltTest3 $graph pen foo -symbol plus $dops
-bltTest3 $graph pen foo -symbol scross $dops
-bltTest3 $graph pen foo -symbol splus $dops
-bltTest3 $graph pen foo -symbol square $dops
-bltTest3 $graph pen foo -symbol triangle $dops
-bltTest3 $graph pen foo -valueanchor nw $dops
-bltTest3 $graph pen foo -valueanchor n $dops
-bltTest3 $graph pen foo -valueanchor ne $dops
-bltTest3 $graph pen foo -valueanchor e $dops
-bltTest3 $graph pen foo -valueanchor se $dops
-bltTest3 $graph pen foo -valueanchor s $dops
-bltTest3 $graph pen foo -valueanchor sw $dops
-bltTest3 $graph pen foo -valueanchor w $dops
-bltTest3 $graph pen foo -valuecolor cyan $dops
-bltTest3 $graph pen foo -valuefont {times 18 bold italic} $dops
-bltTest3 $graph pen foo -valueformat "%e" $dops
-bltTest3 $graph pen foo -valuerotate 45 $dops
+bltTest3 $bltgr pen foo -color yellow $dops
+bltTest3 $bltgr pen foo -dashes {8 3} $dops
+bltTest3 $bltgr pen foo -errorbarcolor green $dops
+bltTest3 $bltgr pen foo -errorbarwidth 2 $dops
+bltTest3 $bltgr pen foo -errorbarcap 10 $dops
+bltTest3 $bltgr pen foo -fill cyan $dops
+bltTest3 $bltgr pen foo -linewidth 3 $dops
+bltTest3 $bltgr pen foo -offdash black $dops
+bltTest3 $bltgr pen foo -outline green $dops
+bltTest3 $bltgr pen foo -outlinewidth 5 $dops
+bltTest3 $bltgr pen foo -pixels 20 $dops
+bltTest3 $bltgr pen foo -showvalues none $dops
+bltTest3 $bltgr pen foo -symbol arrow $dops
+bltTest3 $bltgr pen foo -symbol cross $dops
+bltTest3 $bltgr pen foo -symbol diamond $dops
+bltTest3 $bltgr pen foo -symbol none $dops
+bltTest3 $bltgr pen foo -symbol plus $dops
+bltTest3 $bltgr pen foo -symbol scross $dops
+bltTest3 $bltgr pen foo -symbol splus $dops
+bltTest3 $bltgr pen foo -symbol square $dops
+bltTest3 $bltgr pen foo -symbol triangle $dops
+bltTest3 $bltgr pen foo -valueanchor nw $dops
+bltTest3 $bltgr pen foo -valueanchor n $dops
+bltTest3 $bltgr pen foo -valueanchor ne $dops
+bltTest3 $bltgr pen foo -valueanchor e $dops
+bltTest3 $bltgr pen foo -valueanchor se $dops
+bltTest3 $bltgr pen foo -valueanchor s $dops
+bltTest3 $bltgr pen foo -valueanchor sw $dops
+bltTest3 $bltgr pen foo -valueanchor w $dops
+bltTest3 $bltgr pen foo -valuecolor cyan $dops
+bltTest3 $bltgr pen foo -valuefont {times 18 bold italic} $dops
+bltTest3 $bltgr pen foo -valueformat "%e" $dops
+bltTest3 $bltgr pen foo -valuerotate 45 $dops
 
-bltCmd $graph pen cget foo -color
-bltCmd $graph pen configure foo
-bltCmd $graph pen configure foo -color
-bltCmd $graph pen create bar
-bltCmd $graph pen delete bar
-bltCmd $graph pen names 
-bltCmd $graph pen type foo
+bltCmd $bltgr pen cget foo -color
+bltCmd $bltgr pen configure foo
+bltCmd $bltgr pen configure foo -color
+bltCmd $bltgr pen create bar
+bltCmd $bltgr pen delete bar
+bltCmd $bltgr pen names 
+bltCmd $bltgr pen type foo
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/marker.tcl b/tests/marker.tcl
index 8a09a43..41bf58f 100644
--- a/tests/marker.tcl
+++ b/tests/marker.tcl
@@ -1,32 +1,32 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-set mm [$graph marker create line tt -element data1 \
+set mm [$bltgr marker create line tt -element data1 \
 	    -coords {1 50 1.5 100 1 150} -linewidth 5 -bind {aa}]
-set nn [$graph marker create line ss -element data1 \
+set nn [$bltgr marker create line ss -element data1 \
 	    -coords {1 150 .5 100 1 50} -linewidth 1 \
 	    -outline green -dashes 4]
 
 puts stderr "Testing Marker..."
 
-#bltCmd $graph marker bind aa <Button-1> [list puts "%x %y"]
-bltCmd $graph marker cget $mm -cap
-bltCmd $graph marker configure $mm
-bltCmd $graph marker configure $mm -cap
-set foo [$graph marker create line]
-bltCmd $graph marker delete $foo
-set foo [$graph marker create line foo]
-bltCmd $graph marker delete $foo
-bltCmd $graph marker exists $mm
-bltCmd $graph marker find enclosed 0 0 2 200
-bltCmd $graph marker lower $mm
-bltCmd $graph marker lower $mm $nn
-bltCmd $graph marker names
-bltCmd $graph marker raise $mm
-bltCmd $graph marker raise $mm $nn
-bltCmd $graph marker type $mm
+#bltCmd $bltgr marker bind aa <Button-1> [list puts "%x %y"]
+bltCmd $bltgr marker cget $mm -cap
+bltCmd $bltgr marker configure $mm
+bltCmd $bltgr marker configure $mm -cap
+set foo [$bltgr marker create line]
+bltCmd $bltgr marker delete $foo
+set foo [$bltgr marker create line foo]
+bltCmd $bltgr marker delete $foo
+bltCmd $bltgr marker exists $mm
+bltCmd $bltgr marker find enclosed 0 0 2 200
+bltCmd $bltgr marker lower $mm
+bltCmd $bltgr marker lower $mm $nn
+bltCmd $bltgr marker names
+bltCmd $bltgr marker raise $mm
+bltCmd $bltgr marker raise $mm $nn
+bltCmd $bltgr marker type $mm
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/polygonmarker.tcl b/tests/polygonmarker.tcl
index b1712b0..08a6a28 100644
--- a/tests/polygonmarker.tcl
+++ b/tests/polygonmarker.tcl
@@ -1,29 +1,29 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-set mm [$graph marker create polygon tt -element data2 \
+set mm [$bltgr marker create polygon tt -element data2 \
 	    -coords {1 50 1.5 100 1 150} -linewidth 5]
-$graph element configure data1 -hide yes
+$bltgr element configure data1 -hide yes
 
 puts stderr "Testing Polygon Marker..."
 
-bltTest3 $graph marker $mm -bindtags {aa} 0
-bltTest3 $graph marker $mm -cap round $dops
-bltTest3 $graph marker $mm -coords {1 50 1.5 100 2 150} $dops
-bltTest3 $graph marker $mm -dashes {8 3} $dops
-bltTest3 $graph marker $mm -element data1 $dops
-bltTest3 $graph marker $mm -fill yellow $dops
-bltTest3 $graph marker $mm -join round $dops
-bltTest3 $graph marker $mm -linewidth 1 $dops
-bltTest3 $graph marker $mm -hide yes $dops
-bltTest3 $graph marker $mm -mapx x2 $dops
-bltTest3 $graph marker $mm -mapy y2 $dops
-bltTest3 $graph marker $mm -outline yellow $dops
-bltTest3 $graph marker $mm -under yes $dops
-bltTest3 $graph marker $mm -xoffset 20 $dops
-bltTest3 $graph marker $mm -yoffset 20 $dops
+bltTest3 $bltgr marker $mm -bindtags {aa} 0
+bltTest3 $bltgr marker $mm -cap round $dops
+bltTest3 $bltgr marker $mm -coords {1 50 1.5 100 2 150} $dops
+bltTest3 $bltgr marker $mm -dashes {8 3} $dops
+bltTest3 $bltgr marker $mm -element data1 $dops
+bltTest3 $bltgr marker $mm -fill yellow $dops
+bltTest3 $bltgr marker $mm -join round $dops
+bltTest3 $bltgr marker $mm -linewidth 1 $dops
+bltTest3 $bltgr marker $mm -hide yes $dops
+bltTest3 $bltgr marker $mm -mapx x2 $dops
+bltTest3 $bltgr marker $mm -mapy y2 $dops
+bltTest3 $bltgr marker $mm -outline yellow $dops
+bltTest3 $bltgr marker $mm -under yes $dops
+bltTest3 $bltgr marker $mm -xoffset 20 $dops
+bltTest3 $bltgr marker $mm -yoffset 20 $dops
 
 puts stderr "done"
 bltPlotDestroy $w
diff --git a/tests/ps.tcl b/tests/ps.tcl
index 7a9ce23..e8f9e16 100644
--- a/tests/ps.tcl
+++ b/tests/ps.tcl
@@ -1,26 +1,26 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-$graph axis configure x -title "X\nAxis" -limitsformat "%g"
-$graph axis configure y -title "Y\nAxis"
+$bltgr axis configure x -title "X\nAxis" -limitsformat "%g"
+$bltgr axis configure y -title "Y\nAxis"
 
-$graph element configure data1 -dash {8 3} -showvalues y -smooth step -symbol circle -outline yellow -outlinewidth 3 -pixels 10 -valuefont "times 14 italic" -valuerotate 45
+$bltgr element configure data1 -dash {8 3} -showvalues y -smooth step -symbol circle -outline yellow -outlinewidth 3 -pixels 10 -valuefont "times 14 italic" -valuerotate 45
 
-$graph legend configure -relief raised
-$graph xaxis configure -bg cyan -relief raised
-$graph configure -relief raised
-$graph configure -plotrelief raised
+$bltgr legend configure -relief raised
+$bltgr xaxis configure -bg cyan -relief raised
+$bltgr configure -relief raised
+$bltgr configure -plotrelief raised
 
-$graph legend selection set data2
-$graph legend focus data1
-$graph legend configure -selectrelief groove
+$bltgr legend selection set data2
+$bltgr legend focus data1
+$bltgr legend configure -selectrelief groove
 
-$graph postscript configure -decorations yes
-$graph postscript output foo.ps
-$graph postscript configure -decorations no
-$graph postscript output bar.ps
+$bltgr postscript configure -decorations yes
+$bltgr postscript output foo.ps
+$bltgr postscript configure -decorations no
+$bltgr postscript output bar.ps
 
 #set graph [bltBarGraph $w]
 
diff --git a/tests/test.tcl b/tests/test.tcl
index df6ffd8..bda7494 100644
--- a/tests/test.tcl
+++ b/tests/test.tcl
@@ -1,10 +1,8 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-#set graph [bltBarGraph $w]
-
-#puts stderr "done"
-#bltPlotDestroy $w
+puts stderr "done"
+bltPlotDestroy $w
 
diff --git a/tests/textmarker.tcl b/tests/textmarker.tcl
index ba3defc..908ee50 100644
--- a/tests/textmarker.tcl
+++ b/tests/textmarker.tcl
@@ -1,43 +1,43 @@
 source base.tcl
 
 set w .line
-set graph [bltLineGraph $w]
+set bltgr [bltLineGraph $w]
 
-set mm [$graph marker create text tt -element data2 \
+set mm [$bltgr marker create text tt -element data2 \
 	    -coords {1. 112} -text "Text\nMarker" -font {helvetica 24}]
-$graph element configure data1 -hide yes
+$bltgr element configure data1 -hide yes
 
 puts stderr "Testing Text Marker..."
 
-bltTest3 $graph marker $mm -anchor nw $dops
-bltTest3 $graph marker $mm -anchor n $dops
-bltTest3 $graph marker $mm -anchor ne $dops
-bltTest3 $graph marker $mm -anchor e $dops
-bltTest3 $graph marker $mm -anchor se $dops
-bltTest3 $graph marker $mm -anchor s $dops
-bltTest3 $graph marker $mm -anchor sw $dops
-bltTest3 $graph marker $mm -anchor w $dops
-bltTest3 $graph marker $mm -background yellow $dops
-bltTest3 $graph marker $mm -bg red $dops
-bltTest3 $graph marker $mm -bindtags {aa} 0
-bltTest3 $graph marker $mm -coords {1 50} $dops
-bltTest3 $graph marker $mm -element data1 $dops
-bltTest3 $graph marker $mm -fg cyan $dops
-bltTest3 $graph marker $mm -fill yellow $dops
-bltTest3 $graph marker $mm -font {times 24 bold italic} $dops
-bltTest3 $graph marker $mm -foreground blue $dops
-bltTest3 $graph marker $mm -justify left $dops
-bltTest3 $graph marker $mm -justify center $dops
-bltTest3 $graph marker $mm -justify right $dops
-bltTest3 $graph marker $mm -hide yes $dops
-bltTest3 $graph marker $mm -mapx x2 $dops
-bltTest3 $graph marker $mm -mapy y2 $dops
-bltTest3 $graph marker $mm -outline green $dops
-bltTest3 $graph marker $mm -rotate 45 $dops
-bltTest3 $graph marker $mm -text {Hello World} $dops
-bltTest3 $graph marker $mm -under yes $dops
-bltTest3 $graph marker $mm -xoffset 20 $dops
-bltTest3 $graph marker $mm -yoffset 20 $dops
+bltTest3 $bltgr marker $mm -anchor nw $dops
+bltTest3 $bltgr marker $mm -anchor n $dops
+bltTest3 $bltgr marker $mm -anchor ne $dops
+bltTest3 $bltgr marker $mm -anchor e $dops
+bltTest3 $bltgr marker $mm -anchor se $dops
+bltTest3 $bltgr marker $mm -anchor s $dops
+bltTest3 $bltgr marker $mm -anchor sw $dops
+bltTest3 $bltgr marker $mm -anchor w $dops
+bltTest3 $bltgr marker $mm -background yellow $dops
+bltTest3 $bltgr marker $mm -bg red $dops
+bltTest3 $bltgr marker $mm -bindtags {aa} 0
+bltTest3 $bltgr marker $mm -coords {1 50} $dops
+bltTest3 $bltgr marker $mm -element data1 $dops
+bltTest3 $bltgr marker $mm -fg cyan $dops
+bltTest3 $bltgr marker $mm -fill yellow $dops
+bltTest3 $bltgr marker $mm -font {times 24 bold italic} $dops
+bltTest3 $bltgr marker $mm -foreground blue $dops
+bltTest3 $bltgr marker $mm -justify left $dops
+bltTest3 $bltgr marker $mm -justify center $dops
+bltTest3 $bltgr marker $mm -justify right $dops
+bltTest3 $bltgr marker $mm -hide yes $dops
+bltTest3 $bltgr marker $mm -mapx x2 $dops
+bltTest3 $bltgr marker $mm -mapy y2 $dops
+bltTest3 $bltgr marker $mm -outline green $dops
+bltTest3 $bltgr marker $mm -rotate 45 $dops
+bltTest3 $bltgr marker $mm -text {Hello World} $dops
+bltTest3 $bltgr marker $mm -under yes $dops
+bltTest3 $bltgr marker $mm -xoffset 20 $dops
+bltTest3 $bltgr marker $mm -yoffset 20 $dops
 
 puts stderr "done"
 bltPlotDestroy $w