diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestEverything.java b/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestEverything.java
index 9f65aabf2..ac3ca2eb2 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestEverything.java
+++ b/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/eval/TestEverything.java
@@ -23,8 +23,13 @@ package org.apache.poi.hssf.record.formula.eval;
 import junit.framework.TestSuite;
 
 /**
- * @author Amol S. Deshmukh < amolweb at ya hoo dot com >
+ * This is a test of all the Eval functions we have implemented.
+ * Add newly implemented Eval functions in here to have them
+ *  tested.
+ * For newly implemented functions, 
+ *  @see org.apache.poi.hssf.record.formula.functions.TestEverything
  *
+ * @author Amol S. Deshmukh < amolweb at ya hoo dot com >
  */
 public class TestEverything extends TestSuite {
 
@@ -45,12 +50,9 @@ public class TestEverything extends TestSuite {
         suite.addTest(new GenericFormulaTestCase("D71")); // UnaryMinusEval
         suite.addTest(new GenericFormulaTestCase("D75")); // UnaryPlusEval
         
-        suite.addTest(new GenericFormulaTestCase("D249")); // Concatenate
-        suite.addTest(new GenericFormulaTestCase("D741")); // Int
-        suite.addTest(new GenericFormulaTestCase("D1393")); // Trim
-        suite.addTest(new GenericFormulaTestCase("D1421")); // Upper
-        
-        // Add newly implemented formula functions here 
+		// Add newly implemented Eval functions here
+		// (Formula functions go in 
+ 		//  @see org.apache.poi.hssf.record.formula.functions.TestEverything )
         
         return suite;
     }
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestEverything.java b/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestEverything.java
index ad9399633..833781021 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestEverything.java
+++ b/src/scratchpad/testcases/org/apache/poi/hssf/record/formula/functions/TestEverything.java
@@ -25,11 +25,16 @@ import org.apache.poi.hssf.record.formula.eval.GenericFormulaTestCase;
 import junit.framework.TestSuite;
 
 /**
- * @author Amol S. Deshmukh < amolweb at ya hoo dot com >
+ * This is a test of all the normal formula functions we have implemented.
+ * It should pick up newly implemented functions which are correctly added
+ *  to the test formula excel file, but tweak the rows below if you
+ *  add any past the end of what's currently checked.
+ * For newly implemented eval functions, 
+ *  @see org.apache.poi.hssf.record.formula.eval.TestEverything
  *
+ * @author Amol S. Deshmukh < amolweb at ya hoo dot com >
  */
 public class TestEverything extends TestSuite {
-
     public static TestSuite suite() throws Exception {
         TestSuite suite = new TestSuite("Tests for individual function classes");
         String s;