Index: tests/focusTcl.test
==================================================================
--- tests/focusTcl.test
+++ tests/focusTcl.test
@@ -400,11 +400,11 @@
     cleanup1 .
 } -result {.b.x}
 test focusTcl-5.5 {tkFocusOK procedure, -takefocus "", not mapped} -body {
     setup1 .
     .b.x configure -takefocus ""
-    pack unpack .b.x
+    pack forget .b.x
     update
     tk_focusNext .b
 } -cleanup {
     cleanup1 .
 } -result {.b.y}
@@ -411,30 +411,30 @@
 test focusTcl-5.6 {tkFocusOK procedure, -takefocus "", not mapped} -body {
     setup1 .
     foreach w {.b.x .b.y .b.z} {
         $w configure -takefocus ""
     }
-    pack unpack .b
+    pack forget .b
     update
     tk_focusNext .b
 } -cleanup {
     cleanup1 .
 } -result {.c}
 test focusTcl-5.7 {tkFocusOK procedure, -takefocus "", not mapped} -body {
     setup1 .
     .b.y configure -takefocus 1
-    pack unpack .b.y
+    pack forget .b.y
     update
     tk_focusNext .b.x
 } -cleanup {
     cleanup1 .
 } -result {.b.z}
 test focusTcl-5.8 {tkFocusOK procedure, -takefocus "", not mapped} -body {
     proc always args {return 1}
     setup1 .
     .b.y configure -takefocus always
-    pack unpack .b.y
+    pack forget .b.y
     update
     tk_focusNext .b.x
 } -cleanup {
     cleanup1 .
 } -result {.b.y}

Index: tests/pack.test
==================================================================
--- tests/pack.test
+++ tests/pack.test
@@ -1401,11 +1401,11 @@
     lower .pack.f.f2
     pack .pack.f.f2 -side top
     pack .pack.b -in .pack.f.f2
     update
     set result [winfo geom .pack.b]
-    pack unpack .pack.a
+    pack forget .pack.a
     update
     lappend result [winfo geom .pack.b]
 } -cleanup {
     destroy .pack.f
 } -result {50x30+0+40 50x30+0+0}
@@ -1439,11 +1439,11 @@
     lower .pack.f.f2
     pack .pack.f.f2 -side top
     pack .pack.b -in .pack.f.f2
     update
     set result [winfo ismapped .pack.b]
-    pack unpack .pack.f
+    pack forget .pack.f
     update
     lappend result [winfo ismapped .pack.b]
 } -cleanup {
     destroy .pack.f
 } -result {1 0}

Index: tests/text.test
==================================================================
--- tests/text.test
+++ tests/text.test
@@ -2602,11 +2602,11 @@
 } -cleanup {
     destroy .t
 } -result {3}
 test text-10.38 {TextWidgetCmd procedure, "count" option} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
 } -body {
     .t configure -width 20 -height 10
     update
     .t insert end [string repeat "abcde " 50]\n
     .t insert end [string repeat "fghij " 50]\n
@@ -2693,11 +2693,11 @@
 } -result {1 1}
 
 
 test text-11.1 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
 } -body {
     .t insert end "hello"
     .t configure -wrap none
     list [.t count -displaychars 1.0 1.0] \
       [.t count -displaychars 1.0 1.1] \
@@ -2710,11 +2710,11 @@
 } -cleanup {
     destroy .t
 } -result {0 1 2 3 4 5 5 6}
 test text-11.2 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
 } -body {
     .t insert end "hello"
     .t tag configure elide1 -elide 0
     .t tag add elide1 1.2 1.4
     .t count -displaychars 1.0 1.5
@@ -2822,11 +2822,11 @@
 } -cleanup {
     destroy .t
 } -result {5 5}
 test text-11.8 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
     set res {}
 } -body {
     .t insert end "hello"
 # Newer tags are higher priority
     .t tag configure elide1 -elide 0
@@ -2848,11 +2848,11 @@
 } -cleanup {
     destroy .t
 } -result {0 0 0 0 3 2 1 1}
 test text-11.9 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
     set res {}
 } -body {
     .t tag configure WELCOME -elide 1
     .t tag configure SYSTEM -elide 0
     .t tag configure TRAFFIC -elide 1
@@ -3209,11 +3209,11 @@
 test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
     .top.t configure -width 20 -height 10 
-    pack append .top .top.t top
+    pack .top.t -side top
     update
     set geom [wm geometry .top]
     set x [string range $geom 0 [string first + $geom]]
 } -cleanup {
     destroy .top
@@ -3226,11 +3226,11 @@
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
     .top.t configure -width 20 -height 10 -setgrid 1
     wm overrideredirect .top 1
-    pack append .top .top.t top
+    pack .top.t -side top
     wm geometry .top +0+0
     update
     wm geometry .top
 } -cleanup {
     destroy .top
@@ -3243,11 +3243,11 @@
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
     .top.t configure -width 20 -height 10 -setgrid 1
     wm overrideredirect .top 1
-    pack append .top .top.t top
+    pack .top.t -side top
     wm geometry .top +0+0
     update
     set result [wm geometry .top]
     wm geometry .top 15x8
     update
@@ -3533,11 +3533,11 @@
 Line 4
 }
 test text-19.11 {DeleteChars procedure} -body {
     toplevel .top
     text .top.t -width 20 -height 5
-    pack append .top .top.t top
+    pack .top.t -side top
     wm geometry .top +0+0
     .top.t insert 1.0 "abc\n123\nx\ny\nz\nq\nr\ns"
     update
     .top.t delete 1.0 3.0
     list [.top.t index @0,0] [.top.t get @0,0]
@@ -3545,11 +3545,11 @@
     destroy .top
 } -result {1.0 x}
 test text-19.12 {DeleteChars procedure} -body {
     toplevel .top
     text .top.t -width 20 -height 5
-    pack append .top .top.t top
+    pack .top.t -side top
     wm geometry .top +0+0
     .top.t insert 1.0 "abc\n123\nx\ny\nz\nq\nr\ns"
     .top.t yview 3.0
     update
     .top.t delete 2.0 4.0
@@ -3618,11 +3618,11 @@
 } -result {2.3 2.0}
 
 
 test text-20.1 {TextFetchSelection procedure} -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
     update
 } -body {
     foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
         .t insert end $i.0$i.1$i.2$i.3$i.4\n
     }
@@ -3633,11 +3633,11 @@
 } -result {a.1a.2a.3a.4
 b.0b.1b.2b.3b.4
 c.0c}
 test text-20.2 {TextFetchSelection procedure} -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
     update
 } -body {
     foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
         .t insert end $i.0$i.1$i.2$i.3$i.4\n
     }
@@ -3653,11 +3653,11 @@
 } -result {a.0a.1a.2a.3a.4
 b.0b.1b.2b.3b.4
 c.0c}
 test text-20.3 {TextFetchSelection procedure}  -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
     update
 } -body {
     foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
         .t insert end $i.0$i.1$i.2$i.3$i.4\n
     }
@@ -3667,11 +3667,11 @@
 } -cleanup {
     destroy .t
 } -result {m}
 test text-20.4 {TextFetchSelection procedure}  -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
     update
 } -body {
     foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
         .t insert end $i.0$i.1$i.2$i.3$i.4\n
     }
@@ -3687,11 +3687,11 @@
     destroy .t
 } -result {0a..1b.2b.3b.4
 cj.0j.1j.2j.3j.4m}
 test text-20.5 {TextFetchSelection procedure, long selections} -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -side top -expand 1 -fill both
     update
     set x ""
 } -body {
     for {set i 1} {$i < 200} {incr i} {
         append x "This is line $i, padded to just about 53 characters.\n"

Index: tests/textDisp.test
==================================================================
--- tests/textDisp.test
+++ tests/textDisp.test
@@ -37,11 +37,11 @@
 # because some window managers don't allow the overall width of a window
 # to get very narrow.
 
 catch {destroy .f .t}
 frame .f -width 100 -height 20
-pack append . .f left
+pack .f -side left
 
 set fixedFont {Courier -12}
 # 15 on XP, 13 on Solaris 8
 set fixedHeight [font metrics $fixedFont -linespace]
 # 7 on all platforms
@@ -63,11 +63,11 @@
 # 21 on XP
 set bigAscent [font metrics $bigFont -ascent]
 set ascentDiff [expr {$bigAscent - $fixedAscent}]
 
 text .t -font $fixedFont -width 20 -height 10 -yscrollcommand scroll
-pack append . .t {top expand fill}
+pack .t -side top -expand 1 -fill both
 .t tag configure big -font $bigFont
 .t debug on
 wm geometry . {}
 
 # The statements below reset the main window;  it's needed if the window
@@ -597,11 +597,11 @@
 
     if {$tcl_platform(platform) == "windows"} {
 	wm overrideredirect . 1
     }
     frame .f2 -width 20 -height 100
-    pack before .f .f2 top
+    pack .f2 -before .f -side top
     wm geom . 103x103
     update
     .t configure -wrap none -borderwidth 2
     .t delete 1.0 end
     .t insert end "Line 1\nLine 2 is so long that it wraps around\nLine 3"

Index: tests/textIndex.test
==================================================================
--- tests/textIndex.test
+++ tests/textIndex.test
@@ -11,11 +11,11 @@
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 catch {destroy .t}
 text .t -font {Courier -12} -width 20 -height 10
-pack append . .t {top expand fill}
+pack .t -side top -expand 1 -fill both
 update
 .t debug on
 wm geometry . {}
   
 # The statements below reset the main window;  it's needed if the window
@@ -712,21 +712,21 @@
     catch {destroy .t2}
     set res
 } {3.4 3.0 1.0}
 
 frame .f -width 100 -height 20
-pack append . .f left
+pack .f -side left
 
 set fixedFont {Courier -12}
 set fixedHeight [font metrics $fixedFont -linespace]
 set fixedWidth [font measure $fixedFont m]
 
 set varFont {Times -14}
 set bigFont {Helvetica -24}
 destroy .t
 text .t -font $fixedFont -width 20 -height 10 -wrap char
-pack append . .t {top expand fill}
+pack .t -side top -expand 1 -fill both
 .t tag configure big -font $bigFont
 .t debug on
 wm geometry . {}
 
 # The statements below reset the main window;  it's needed if the window

Index: tests/textMark.test
==================================================================
--- tests/textMark.test
+++ tests/textMark.test
@@ -11,11 +11,11 @@
 tcltest::configure {*}$argv
 tcltest::loadTestedCommands
 
 destroy .t
 text .t -width 20 -height 10
-pack append . .t {top expand fill}
+pack .t -side top -expand 1 -fill both
 update
 .t debug on
 wm geometry . {}
 entry .t.e
 .t peer create .pt

Index: tests/textTag.test
==================================================================
--- tests/textTag.test
+++ tests/textTag.test
@@ -15,11 +15,11 @@
 text .t -width 20 -height 10
 testConstraint haveCourier12 [expr {[catch {
     .t configure -font {Courier 12}
 }] == 0}]
 
-pack append . .t {top expand fill}
+pack .t -side top -expand 1 -fill both
 update
 .t debug on
 
 wm geometry . {}
 set bigFont {Helvetica 24}

Index: tests/textWind.test
==================================================================
--- tests/textWind.test
+++ tests/textWind.test
@@ -20,11 +20,11 @@
 
 
 deleteWindows
 # Widget used in tests 1.* - 16.*
 text .t -width 30 -height 6 -bd 2 -highlightthickness 2
-pack append . .t {top expand fill}
+pack .t -side top -expand 1 -fill both
 update
 .t debug on
 
 # 15 on XP, 13 on Solaris 8
 set fixedHeight [font metrics {Courier -12} -linespace]