diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index c0b4a4bc1..b11cab81e 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,5 +1,9 @@
+2005-12-22  Alex Roitman  <shura@gramps-project.org>
+	* test/RunAllTests.py: Change header.
+	* src/EventEdit.py: Fix build_ methods.
+
 2005-12-22  Don Allingham  <don@gramps-project.org>
-        * src/DisplayState.py: window management improvements
+	* src/DisplayState.py: window management improvements
 	* src/EditPerson.py: window management improvements
 	* src/EditPlace.py: window management improvements
 	* src/EditSource.py: window management improvements
diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py
index 986ae5227..babf0894e 100644
--- a/gramps2/src/EventEdit.py
+++ b/gramps2/src/EventEdit.py
@@ -404,14 +404,14 @@ class EventRefEditor(DisplayState.ManagedWindow):
         self.state = state
         self.uistate = uistate
         self.referent = referent
+        self.event_ref = event_ref
+        self.event = event
 
         DisplayState.ManagedWindow.__init__(self, uistate, track, event_ref)
         if self.already_exist:
             return
 
         self.update = update
-        self.event_ref = event_ref
-        self.event = event
 
         self.pmap = {}
         for key in self.db.get_place_handles():
@@ -552,23 +552,23 @@ class EventRefEditor(DisplayState.ManagedWindow):
         self.window.set_transient_for(self.parent_window)
         self.window.show()
 
-    def build_menu_names(self,event):
-        if event:
-            if event.get_type()[0] == RelLib.Event.CUSTOM:
-                event_name = event.get_type()[1]
+    def build_menu_names(self,eventref):
+        if self.event:
+            if self.event.get_type()[0] == RelLib.Event.CUSTOM:
+                event_name = self.event.get_type()[1]
             else:
                 try:
-                    event_name = Utils.personal_events[event.get_type()[0]]
+                    event_name = Utils.personal_events[self.event.get_type()[0]]
                 except:
-                    event_name = Utils.family_events[event.get_type()[0]]
+                    event_name = Utils.family_events[self.event.get_type()[0]]
             submenu_label = _('Event: %s')  % event_name
         else:
             submenu_label = _('New Event')
         menu_label = _('Event Reference Editor')
         
-    def build_window_key(self,event):
-        if event:
-            return event.get_handle()
+    def build_window_key(self,eventref):
+        if self.event:
+            return self.event.get_handle()
         else:
             return self
 
diff --git a/gramps2/test/RunAllTests.py b/gramps2/test/RunAllTests.py
index e4c87a445..044028755 100644
--- a/gramps2/test/RunAllTests.py
+++ b/gramps2/test/RunAllTests.py
@@ -1,5 +1,29 @@
-"""Copyright QinetiQ Ltd (2005) - See LICENSE.TXT for licensing information.
+#
+# Gramps - a GTK+/GNOME based genealogy program
+#
+# Copyright (C) 2000-2005  Donald N. Allingham
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
 
+# $Id$
+
+# Written by Richard Taylor
+
+"""
+Testing framework for performing a variety of unttests for GRAMPS.
 """
 
 import logging