Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.57
diff -u -r1.57 comment.test
--- modules/comment/comment.test	11 Dec 2009 17:09:00 -0000	1.57
+++ modules/comment/comment.test	13 Dec 2009 01:29:32 -0000
@@ -20,12 +20,10 @@
    * @param object $node Node to post comment on.
    * @param string $comment Comment body.
    * @param string $subject Comment subject.
-   * @param mixed $contact Set to NULL for no contact info, TRUE to ignore success checking, and array of values to set contact info.
-   *
-   * This needs to be static to be invoked via CommentHelperCase::postComment()
-   * in other tests.
+   * @param mixed $contact Set to NULL for no contact info, TRUE to ignore
+   *   success checking, and array of values to set contact info.
    */
-  public static function postComment($node, $comment, $subject = '', $contact = NULL) {
+  public function postComment($node, $comment, $subject = '', $contact = NULL) {
     $edit = array();
     $edit['comment'] = $comment;
 
Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.71
diff -u -r1.71 user.test
--- modules/user/user.test	10 Dec 2009 15:39:43 -0000	1.71
+++ modules/user/user.test	13 Dec 2009 01:29:32 -0000
@@ -302,7 +302,17 @@
   }
 }
 
-class UserCancelTestCase extends DrupalWebTestCase {
+/**
+ * Test cancelling a user.
+ * 
+ * TODO: Inheriting CommentHelperCase is a STOP-GAP MEASURE
+ *   indended to fix fatal errors in tests. This should really
+ *   be worked out properly so UserCancelTestCase can inherit
+ *   something more logical.
+ * 
+ *   See http://drupal.org/node/653940#comment-2369334
+ */
+class UserCancelTestCase extends CommentHelperCase {
   public static function getInfo() {
     return array(
       'name' => 'Cancel account',
@@ -531,7 +541,9 @@
 
     // Create comment.
     module_load_include('test', 'comment');
-    $comment = CommentHelperCase::postComment($node, $this->randomName(32), '', TRUE);
+    // TODO: The line below uses postComment() inherited from 
+    // CommentHelperCase. This is a temporary solution. See doc block.
+    $comment = $this->postComment($node, $this->randomName(32), '', TRUE);
     $this->assertTrue(comment_load($comment->id), t('Comment found.'));
 
     // Create a node with two revisions, the initial one belonging to the