diff --git a/data/scenario-test.cfg b/data/scenario-test.cfg
index 8820e2eff07..e388273467e 100644
--- a/data/scenario-test.cfg
+++ b/data/scenario-test.cfg
@@ -29,6 +29,40 @@ Xu          ,Xu          , Qxu         , Qxu         , Ql          , Ql
 Xu          ,Xu          , Qxu         , Qxu         , Ql          , Ql          , Ql          , Xu          , Xu          , Xu          , Xu          , Xu          , Xu          , Xu          , Xu          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Gg          , Wo          , Gg          , Wo          , Re          , Wo          , Uu          , Uu          
 "
 
+#     [event]
+#         name=start
+#         {VARIABLE test_1 false}
+#         {VARIABLE test_2 no}
+#
+#         # Test the new boolean_not_equals conditional
+#         [if]
+#             [variable]
+#                 boolean_not_equals=off
+#                 name=test_2
+#             [/variable]
+#             [then]
+#                 [message]
+#                     speaker=narrator
+#                     message="test_2 != false"
+#                 [/message]
+#             [/then]
+#             [else]
+#                 [message]
+#                     speaker=narrator
+#                     message="test_2 == false"
+#                 [/message]
+#             [/else]
+#         [/if]
+#
+#         # Test the new string_length operator
+#         {VARIABLE_OP test_3 string_length "$test_1"}
+#
+#         [message]
+#             speaker=narrator
+#             message="'$test_1|' is $test_3 characters long"
+#         [/message]
+#     [/event]
+
     [event]
         name=moveto
         [filter]
@@ -47,6 +81,53 @@ Xu          ,Xu          , Qxu         , Qxu         , Ql          , Ql
         [/message]
     [/event]
 
+    [event]
+        name=moveto
+        [filter]
+            x,y,side=17,7,1
+        [/filter]
+        [modify_side]
+            side=2
+            gold=1000
+            income=100
+            recruit=Orcish Assassin,Orcish Warrior,Orcish Crossbowman,Wolf Rider,Orcish Archer
+            # Test [modify_side][ai] constructs; torture test for
+            # patch num. 984
+            [ai]
+                time_of_day=morning,afternoon
+                aggression=1.0
+                caution=0.0
+                recruitment_pattern=fighter,fighter,fighter,fighter
+                {NO_SCOUTS}
+            [/ai]
+            [ai]
+                time_of_day=dawn,dusk
+                aggression=1.0
+                caution=0.0
+                recruitment_pattern=archer,archer,archer,archer
+                {NO_SCOUTS}
+            [/ai]
+            [ai]
+                time_of_day=first_watch,second_watch,underground
+                aggression=1.0
+                caution=0.0
+                recruitment_pattern=scout,scout,scout,scout
+                {NO_SCOUTS}
+            [/ai]
+        [/modify_side]
+        {REMOVE_LABEL $x1 $y1}
+        [message]
+            speaker=narrator
+            image=wesnoth-icon.png
+            message="Now the orcs will fight until death; nothing shall stop their powerful warriors!"
+        [/message]
+    [/event]
+
+    [label]
+        x,y=17,7
+        text="Open the hell"
+    [/label]
+
     turns=36
     id=test
 
@@ -98,9 +179,10 @@ Xu          ,Xu          , Qxu         , Qxu         , Ql          , Ql
     {ACT_TELEPORT 10 3 27 15}
 
     [side]
-        type="Mage of Light"
+        random_gender=yes
+        type="Silver Mage"
         side=1
-        canrecruit=1
+        canrecruit=yes
         controller=human
         hitpoints=80
         recruit="Ghost,Troll Whelp,Assassin,Elvish Hero,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Shaman,Red Mage,Spearman,Swordsman,Duelist,Fencer,Elvish Captain,Elvish Ranger,Elvish Shyde,Thief,Rogue,White Mage,Mage of Light,Elvish Sharpshooter,Silver Mage"
@@ -133,7 +215,7 @@ Xu          ,Xu          , Qxu         , Qxu         , Ql          , Ql
         description="Urug-Telfar"
         side=2
         controller=ai
-        canrecruit=1
+        canrecruit=yes
         recruit="Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish Assassin,Saurian Skirmisher,Naga Fighter"
         gold=40
         income=10
@@ -251,9 +333,6 @@ Xu          ,Xu          , Qxu         , Qxu         , Ql          , Ql
                     fog=yes
                 [/modify_side]
                 [redraw][/redraw]
-                [remove_label]
-                    x,y=5,8
-                [/remove_label]
                 [label]
                     x,y=5,8
                     text="Torches, attack!"
@@ -265,9 +344,6 @@ Xu          ,Xu          , Qxu         , Qxu         , Ql          , Ql
                     fog=no
                 [/modify_side]
                 [redraw][/redraw]
-                [remove_label]
-                    x,y=5,8
-                [/remove_label]
                 [label]
                     x,y=5,8
                     text="Let there be fog!"
@@ -694,7 +770,7 @@ _s, _s, _s, _s, Aa, Aa, _s, _s, _s, _s
             [effect]
                 apply_to=new_attack
                 name=ruby of fire
-                description= _ "ruby of fire"
+                description="ruby of fire"
                 icon=attacks/fireball.png
                 type=fire
                 range=ranged