diff --git a/tests/Ticket343TestCase.php b/tests/Ticket343TestCase.php
index 6c8da6ae6..6d22b8147 100644
--- a/tests/Ticket343TestCase.php
+++ b/tests/Ticket343TestCase.php
@@ -1,77 +1,36 @@
 <?php
 /*
  *  $Id$
- * %s
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.com>.
+ */
+
+/**
+ * Doctrine_Ticket343_TestCase
  *
  * @package     Doctrine
  * @author      Lloyd Leung (lleung at carlton decimal ca)
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @category    Object Relational Mapping
  * @link        www.phpdoctrine.com
  * @since       1.0
  * @version     $Revision$
  */
-
-
-
-class Member extends Doctrine_Record
-{
-  const DATABASE_NAME = 'doctrine';
-
-  public function setTableDefinition()
-  {
-    $this->setTableName('members');
-
-    $this->hasColumn('pin', 'string', 8, array('primary'=>true, ));
-    $this->hasColumn('name', 'string', 254, array('notblank'=>true, ));
-  }
-
-  public function setUp()
-  {
-    $this->hasMany('NewsBlast as news_blasts', 'NewsBlast.pin');
-  }
-
-}
-
-
-class NewsBlast extends Doctrine_Record
-{
-  const DATABASE_NAME = 'doctrine';
-
-  public function setTableDefinition()
-  {
-    $this->setTableName('p2m_newsblast');
-    $this->hasColumn('subprogram_id', 'integer', 10, array());
-    $this->hasColumn('title', 'string', 254, array());
-  }
-
-  public function setUp()
-  {
-    $this->hasOne('SubProgram as subprogram', 'NewsBlast.subprogram_id', 'id');
-    $this->hasOne('Member as member', 'NewsBlast.pin', 'pin');
-  }
-
-}
-
-
-class SubProgram extends Doctrine_Record
-{
-  const DATABASE_NAME = 'doctrine';
-
-  public function setTableDefinition()
-  {
-    $this->setTableName('p2m_subprogram');
-    $this->hasColumn('name', 'string', 50, array());
-  }
-
-  public function setUp()
-  {
-    $this->hasMany('Member as members', 'Member.subprogram_id');
-  }
-}
-
-
-
 class Doctrine_Ticket343_TestCase extends Doctrine_UnitTestCase
 {
     public function prepareData() 
@@ -80,9 +39,6 @@ class Doctrine_Ticket343_TestCase extends Doctrine_UnitTestCase
     { }
     public function testForeignPkNonId()
     {
-
-		die('happy!');
-
         $member = new Member();
         $subprogram = new SubProgram();
         $newsblast = new NewsBlast();
@@ -105,3 +61,57 @@ class Doctrine_Ticket343_TestCase extends Doctrine_UnitTestCase
 
     }
 }
+
+
+class Member extends Doctrine_Record
+{
+    const DATABASE_NAME = 'doctrine';
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('members');
+
+        $this->hasColumn('pin', 'string', 8, array('primary'=>true, ));
+        $this->hasColumn('name', 'string', 254, array('notblank'=>true, ));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('NewsBlast as news_blasts', 'NewsBlast.pin');
+    }
+}
+
+
+class NewsBlast extends Doctrine_Record
+{
+    const DATABASE_NAME = 'doctrine';
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('p2m_newsblast');
+        $this->hasColumn('subprogram_id', 'integer', 10, array());
+        $this->hasColumn('title', 'string', 254, array());
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('SubProgram as subprogram', 'NewsBlast.subprogram_id', 'id');
+        $this->hasOne('Member as member', 'NewsBlast.pin', 'pin');
+    }
+}
+class SubProgram extends Doctrine_Record
+{
+    const DATABASE_NAME = 'doctrine';
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('p2m_subprogram');
+        $this->hasColumn('name', 'string', 50, array());
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Member as members', 'Member.subprogram_id');
+    }
+}
+