From 219e15f3aa5210723068304d0871ac19188e8198 Mon Sep 17 00:00:00 2001
From: el_kaboing <el_kaboing@localhost>
Date: Fri, 22 Sep 2006 21:10:19 +0000
Subject: [PATCH] Added comment blocks for parsing test specifications from the code.

---
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java                  |  148 +++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java               |  507 ++++++++++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java   |   54 +
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java                 |    4 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java       |  144 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java             |   64 +
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java   |  291 ++++++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java       |   22 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java                  |   38 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java       |   35 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java |   86 +
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java           |   22 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java            |   75 +
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java       |  153 +++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java         |   18 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java                     |  632 +++++++++++++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java    |  127 ++
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java      |   61 +
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java               |    4 
 opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java                     |  316 ++++++
 20 files changed, 2,770 insertions(+), 31 deletions(-)

diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java
index 2f88167..11ed5d7 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobAddTests.java
@@ -37,9 +37,9 @@
     #@TestSuitePurpose		Test the add functionality for OpenDS
     #@TestSuiteID		Add Tests
     #@TestSuiteGroup		Bob
-    #@TestGroup  		Bob/BobAddTests
+    #@TestGroup  		Bob
     #@TestScript  		BobAddTests.java
-    #@TestHTMLLink  		blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Bob adds.
@@ -49,7 +49,7 @@
 {
 /*
     Place test-specific test information here.
-    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
     #@TestMarker		Bob Add Tests
     #@TestName  		Bob Add 1
     #@TestID    		BobAdd1
@@ -91,7 +91,7 @@
 
 /*
     Place test-specific test information here.
-    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
     #@TestMarker		Bob Add Tests
     #@TestName  		Bob Add 2
     #@TestID    		BobAdd2
@@ -131,6 +131,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 3
+    #@TestID    		BobAdd3
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a small jpeg photo.
  *
@@ -161,6 +173,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 4
+    #@TestID    		BobAdd4
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a large jpeg photo.
  *
@@ -191,6 +215,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 5
+    #@TestID    		BobAdd5
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a small jpeg photo to each of five existing entries.
  *
@@ -221,6 +257,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 6
+    #@TestID    		BobAdd6
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a large jpeg photo to each of five existing entries.
  *
@@ -251,6 +299,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 7
+    #@TestID    		BobAdd7
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a small jpeg photo.
@@ -282,6 +342,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 8
+    #@TestID    		BobAdd8
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a large jpeg photo.
@@ -313,6 +385,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 9
+    #@TestID    		BobAdd9
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a short labeleduri to an existing entry.
  *
@@ -343,6 +427,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 10
+    #@TestID    		BobAdd10
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a long labeleduri to an existing entry.
  *
@@ -373,6 +469,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 11
+    #@TestID    		BobAdd11
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a short labeleduri.
  *
@@ -403,6 +511,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 12
+    #@TestID    		BobAdd12
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a long labeleduri.
  *
@@ -433,6 +553,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 13
+    #@TestID    		BobAdd13
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a short labeleduri to each of five existing entries.
  *
@@ -463,6 +595,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 14
+    #@TestID    		BobAdd14
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a long labeleduri to each of five existing entries.
  *
@@ -493,6 +637,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 15
+    #@TestID    		BobAdd15
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a short labeleduri.
@@ -524,6 +680,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 16
+    #@TestID    		BobAdd16
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a long labeleduri.
@@ -555,6 +723,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 17
+    #@TestID    		BobAdd17
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a short description to an existing entry.
  *
@@ -585,6 +765,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 18
+    #@TestID    		BobAdd18
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a long description to an existing entry.
  *
@@ -615,6 +807,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 19
+    #@TestID    		BobAdd19
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a short description.
  *
@@ -645,6 +849,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 20
+    #@TestID    		BobAdd20
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a long description.
  *
@@ -675,6 +891,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 21
+    #@TestID    		BobAdd21
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a short description to each of five existing entries.
  *
@@ -705,6 +933,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 22
+    #@TestID    		BobAdd22
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a long description to each of five existing entries.
  *
@@ -735,6 +975,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 23
+    #@TestID    		BobAdd23
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a short description.
@@ -766,6 +1018,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 24
+    #@TestID    		BobAdd24
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a long description.
@@ -797,6 +1061,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 25
+    #@TestID    		BobAdd25
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a short seeAlso to an existing entry.
  *
@@ -827,6 +1103,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 26
+    #@TestID    		BobAdd26
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a long seeAlso to an existing entry.
  *
@@ -857,6 +1145,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 27
+    #@TestID    		BobAdd27
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a short seeAlso.
  *
@@ -887,6 +1187,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 28
+    #@TestID    		BobAdd28
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a long seeAlso.
  *
@@ -917,6 +1229,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 29
+    #@TestID    		BobAdd29
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a short seeAlso to each of five existing entries.
  *
@@ -947,6 +1271,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 30
+    #@TestID    		BobAdd30
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a long seeAlso to each of five existing entries.
  *
@@ -977,6 +1313,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 31
+    #@TestID    		BobAdd31
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a short seeAlso.
@@ -1008,6 +1356,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 32
+    #@TestID    		BobAdd32
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a long seeAlso.
@@ -1039,6 +1399,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 33
+    #@TestID    		BobAdd33
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a short pager number to an existing entry.
  *
@@ -1069,6 +1441,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 34
+    #@TestID    		BobAdd34
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a long pager number to an existing entry.
  *
@@ -1099,6 +1483,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 35
+    #@TestID    		BobAdd35
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a short pager number.
  *
@@ -1129,6 +1525,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 36
+    #@TestID    		BobAdd36
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a new entry as objectclass=inetorgperson that includes a long pager number.
  *
@@ -1159,6 +1567,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 37
+    #@TestID    		BobAdd37
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a short pager number to each of five existing entries.
  *
@@ -1189,6 +1609,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 38
+    #@TestID    		BobAdd38
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a long pager number to each of five existing entries.
  *
@@ -1219,6 +1651,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 39
+    #@TestID    		BobAdd39
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a short pager number.
@@ -1250,6 +1694,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 40
+    #@TestID    		BobAdd40
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add five new entries as objectclass=inetorgperson each of which
  *  includes a long pager number.
@@ -1281,6 +1737,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 41
+    #@TestID    		BobAdd41
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a jpeg photo attribute with no value to an existing entry.
  *
@@ -1311,6 +1779,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 42
+    #@TestID    		BobAdd42
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 0
+*/
 /**
  *  Add a jpeg photo attribute with an ascii value to an existing entry.
  *
@@ -1341,6 +1821,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 43
+    #@TestID    		BobAdd43
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 68
+*/
 /**
  *  Add a duplicate entry as objectclass=inetorgperson that includes a jpeg
  *  photo with no attribute.
@@ -1372,6 +1864,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 44
+    #@TestID    		BobAdd44
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 68
+*/
 /**
  *  Add a duplicate entry as objectclass=inetorgperson that includes a jpeg
  *  photo with an ascii value.
@@ -1443,6 +1947,18 @@
     compareExitCode(retCode, expCode);
   }
 */
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 47
+    #@TestID    		BobAdd47
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 68
+*/
 /**
  *  Add a set of entries where the first entry is a duplicate to an existing entry.
  *
@@ -1473,6 +1989,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 48
+    #@TestID    		BobAdd48
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 68
+*/
 /**
  *  Add a set of entries where the third  entry is a duplicate to an existing entry.
  *
@@ -1503,6 +2031,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 49
+    #@TestID    		BobAdd49
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 21
+*/
 /**
  *  Add a description with no value to an existing entry.
  *
@@ -1533,6 +2073,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 50
+    #@TestID    		BobAdd50
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 1
+*/
 /**
  *  Add a description with a binary value to an existing entry.
  *
@@ -1563,6 +2115,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 51
+    #@TestID    		BobAdd51
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 68
+*/
 /**
  *  Add a new entry with a description that has no value.
  *
@@ -1593,6 +2157,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 52
+    #@TestID    		BobAdd52
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 1
+*/
 /**
  *  Add a new entry with a description that has a binary value.
  *
@@ -1623,6 +2199,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 53
+    #@TestID    		BobAdd53
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 20
+*/
 /**
  *  Add a duplicate desciption to an existing entry.
  *
@@ -1653,6 +2241,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 54
+    #@TestID    		BobAdd54
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 1
+*/
 /**
  *  Add a set of entries where the fourth entry has a binary value for the description.
  *
@@ -1683,6 +2283,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 55
+    #@TestID    		BobAdd55
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 68
+*/
 /**
  *  Add a set of duplicate entries where the descriptions have no value.
  *
@@ -1713,6 +2325,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker		Bob Add Tests
+    #@TestName  		Bob Add 56
+    #@TestID    		BobAdd56
+    #@TestPreamble
+    #@TestSteps  		Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult		Success if OpenDS returns 68
+*/
 /**
  *  Add a set of duplicate entries where the descriptions have very long values.
  *
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java
index 2f952bd..4e85873 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobDeleteTests.java
@@ -37,9 +37,9 @@
     #@TestSuitePurpose          Test the delete functionality for OpenDS
     #@TestSuiteID               Delete Tests
     #@TestSuiteGroup            Bob
-    #@TestGroup                 Bob/BobDeleteTests
+    #@TestGroup                 Bob
     #@TestScript                BobDeleteTests.java
-    #@TestHTMLLink              blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Bob deletes.
@@ -47,6 +47,18 @@
 @Test
 public class BobDeleteTests extends BobTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 1
+    #@TestID                    BobDelete1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete an existing entry using ldapmodify.
  *
@@ -77,6 +89,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 2
+    #@TestID                    BobDelete2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Delete a non-existent entry using ldapmodify by trying to delete the entry that
  *  was deleted in the last step.
@@ -108,6 +132,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 3
+    #@TestID                    BobDelete3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Delete an entry that has a bad DN using ladpmodify.
  *
@@ -138,6 +174,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 4
+    #@TestID                    BobDelete4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete five existing entries using ldapmodify.
  *
@@ -168,6 +216,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 5
+    #@TestID                    BobDelete5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Delete five existing entries using ldapmodify, the fourth of which
  *  has a bad DN.
@@ -199,6 +259,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 6
+    #@TestID                    BobDelete6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 1
+*/
 /**
  *  Delete an existing entry using ldapmodify with an ldif file that
  *  improperly has the format for ldapdelete.
@@ -230,6 +302,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 7
+    #@TestID                    BobDelete7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+                                with the filename to the appropriate data file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete an existing entry using ldapdelete.
  *
@@ -260,6 +344,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 8
+    #@TestID                    BobDelete8
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+                                with the filename to the appropriate data file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Delete a non-existent entry using ldapdelete by trying to delete the entry that
  *  was deleted in the last step.
@@ -291,6 +387,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 9
+    #@TestID                    BobDelete9
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+                                with the filename to the appropriate data file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Delete an entry that has a bad DN using ldapdelete.
  *
@@ -321,6 +429,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 10
+    #@TestID                    BobDelete10
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+                                with the filename to the appropriate data file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete five existing entries using ldapdelete.
  *
@@ -351,6 +471,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 11
+    #@TestID                    BobDelete11
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+                                with the filename to the appropriate data file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Delete five existing entries using ldapdelete, the fourth of which
  *  has a bad DN.
@@ -382,6 +514,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Delete Tests
+    #@TestName                  Bob Delete 12
+    #@TestID                    BobDelete12
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+                                with the filename to the appropriate data file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 34
+*/
 /**
  *  Delete an existing entry using ldapdelete with a file that
  *  improperly has the format for ldapmodify.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java
index a19f1fd..b2116a8 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModTests.java
@@ -37,9 +37,9 @@
     #@TestSuitePurpose          Test the modify functionality for OpenDS
     #@TestSuiteID               Modify Tests
     #@TestSuiteGroup            Bob
-    #@TestGroup                 Bob/BobModifyTests
+    #@TestGroup                 Bob
     #@TestScript                BobModTests.java
-    #@TestHTMLLink              blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Bob modifies.
@@ -131,6 +131,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 3
+    #@TestID                    BobModify3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a small jpeg photo in each of five existing entries.
  *
@@ -160,6 +172,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 4
+    #@TestID                    BobModify4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a large jpeg photo in each of five existing entries.
  *
@@ -189,6 +213,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 5
+    #@TestID                    BobModify5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a short lableduri in an existing entry.
  *
@@ -218,6 +254,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 6
+    #@TestID                    BobModify6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a long lableduri in an existing entry.
  *
@@ -247,6 +295,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 7
+    #@TestID                    BobModify7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a short labeleduri in each of five existing entries.
  *
@@ -276,6 +336,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 8
+    #@TestID                    BobModify8
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a long labeleduri in each of five existing entries.
  *
@@ -305,6 +377,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 9
+    #@TestID                    BobModify9
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a short description in an existing entry.
  *
@@ -334,6 +418,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 10
+    #@TestID                    BobModify10
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a long description in an existing entry.
  *
@@ -363,6 +459,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 11
+    #@TestID                    BobModify11
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a short description in each of five existing entries.
  *
@@ -392,6 +500,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 12
+    #@TestID                    BobModify12
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a long description in each of five existing entries.
  *
@@ -421,6 +541,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 13
+    #@TestID                    BobModify13
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a short seeAlso in an existing entry.
  *
@@ -450,6 +582,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 14
+    #@TestID                    BobModify14
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a long seeAlso in an existing entry.
  *
@@ -479,6 +623,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 15
+    #@TestID                    BobModify15
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a short seeAlso in each of five existing entries.
  *
@@ -508,6 +664,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 16
+    #@TestID                    BobModify16
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a long seeAlso in each of five existing entries.
  *
@@ -537,6 +705,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 17
+    #@TestID                    BobModify17
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a short pager number in an existing entry.
  *
@@ -566,6 +746,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 18
+    #@TestID                    BobModify18
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a long pager number in an existing entry.
  *
@@ -595,6 +787,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 19
+    #@TestID                    BobModify19
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a short pager number in each of five existing entries.
  *
@@ -624,6 +828,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 20
+    #@TestID                    BobModify20
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a long pager number in each of five existing entries.
  *
@@ -653,6 +869,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 21
+    #@TestID                    BobModify21
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a jpeg photo attribute with no value to an existing entry.
  *
@@ -682,6 +910,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 22
+    #@TestID                    BobModify22
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a jpeg photo attribute with an ascii value to an existing entry.
  *
@@ -711,6 +951,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 23
+    #@TestID                    BobModify23
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a jpeg photo attribute which is in ascii format but has a 
  *  null value to an existing entry.
@@ -741,6 +993,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 24
+    #@TestID                    BobModify24
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a jpeg photo attribute with an extra large photo to an existing entry
  *
@@ -770,6 +1034,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 25
+    #@TestID                    BobModify25
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 21
+*/
 /**
  *  Replace a description that has no value.
  *
@@ -799,6 +1075,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 26
+    #@TestID                    BobModify26
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 1
+*/
 /**
  *  Replace a description that has a binary value.
  *
@@ -828,6 +1116,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 27
+    #@TestID                    BobModify27
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace a description that has a variety of different punctuation.
  *
@@ -857,6 +1157,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify Tests
+    #@TestName                  Bob Modify 28
+    #@TestID                    BobModify28
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 1
+*/
 /**
  *  Replace the description of each of five existing entries, but the
  *  fourth entry has the description in binary format.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java
index d565f7f..6817e4a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobModrdnTests.java
@@ -37,7 +37,7 @@
     #@TestSuitePurpose          Test the modify rdn functionality for OpenDS
     #@TestSuiteID               Modify RDN Tests
     #@TestSuiteGroup            Bob
-    #@TestGroup                 Bob/BobModifyRDNTests
+    #@TestGroup                 Bob
     #@TestScript                BobModrdnTests.java
     #@TestHTMLLink              blahblah
 */
@@ -47,6 +47,18 @@
 @Test
 public class BobModrdnTests extends BobTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify RDN Tests
+    #@TestName                  Bob Modify RDN 1
+    #@TestID                    BobModifyRDN1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace the RDN of an existing entry with a short RDN.
  *
@@ -77,6 +89,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify RDN Tests
+    #@TestName                  Bob Modify RDN 2
+    #@TestID                    BobModifyRDN2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace the RDN of an existing entry with a long RDN.
  *
@@ -107,6 +131,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Bob Modify RDN Tests
+    #@TestName                  Bob Modify RDN 3
+    #@TestID                    BobModifyRDN3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace the RDN of an existing entry with a very long RDN.
  *
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java
index 577c85f..5a57af6 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/bob/BobStartupTests.java
@@ -37,9 +37,9 @@
     #@TestSuitePurpose          Setup methods for the Bob test suites
     #@TestSuiteID               Setup 
     #@TestSuiteGroup            Bob
-    #@TestGroup                 Bob/Setup
+    #@TestGroup                 Bob
     #@TestScript                BobStartup.java
-    #@TestHTMLLink              blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Bob startup.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java
index 22be1cf..08234ae 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreEntryCacheTests.java
@@ -37,9 +37,9 @@
     #@TestSuitePurpose          To check that the entry cache is managed correctly.
     #@TestSuiteID               Entry Cache
     #@TestSuiteGroup            Core
-    #@TestGroup                 Core/EntryCache
+    #@TestGroup                 Core
     #@TestScript                CoreEntryCacheTests.java
-    #@TestHTMLLink              blahblah
+    #@
 */
 /**
  * This class contains the TestNG tests for the Core version reporting tests. 
@@ -90,6 +90,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core Entry Cache
+    #@TestName                  Entry Cache 2
+    #@TestID                    CoreEntryCache2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify() 
+                                with the filename to the appropriate ldif file.
+				The ds-config-entryCacheEnabled parameter is set
+				to true under cn=Entry Cache,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Enable the default entry cache.
  *
@@ -120,6 +134,22 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core Entry Cache
+    #@TestName                  Entry Cache 3
+    #@TestID                    CoreEntryCache3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify() 
+                                with the filename to the appropriate ldif file.
+				The attributes, ds-config-locktimeout (value=60),
+				ds-config-excludeFilter (value="telephonenumber=*"),
+				and ds-config-includeFilter (value="roomnumber=*") 
+				are added to cn=Entry Cache,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add three attributes to cn=Entry Cache,cn=config.
  *
@@ -150,6 +180,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core Entry Cache
+    #@TestName                  Entry Cache 4
+    #@TestID                    CoreEntryCache4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify() 
+                                with the filename to the appropriate ldif file.
+				The attribute, ds-config-maxEntries, is added
+				cn=Entry Cache,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add one attribute that is not allowed under cn=Entry Cache,cn=config
  *
@@ -180,6 +224,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core Entry Cache
+    #@TestName                  Entry Cache 5
+    #@TestID                    CoreEntryCache5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify() 
+                                with the filename to the appropriate ldif file.
+				The entry, "cn=Entry Cache 2,cn=config, is added
+				to OpenDS with several attributes.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add second entry cache which is an object of the ds-cfg-fifo-entry-cache class.
  *
@@ -210,6 +268,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core Entry Cache
+    #@TestName                  Entry Cache 6
+    #@TestID                    CoreEntryCache6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch() 
+                                against all the entries currently in OpenDS.
+				The client binds as cn=Directory Manager.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted.
  *
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java
index 1b5e202..1b0ccc0 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchSizeLimitTests.java
@@ -37,9 +37,9 @@
     #@TestSuitePurpose          To check that the search size limit is enforced.
     #@TestSuiteID               Search Size Limit
     #@TestSuiteGroup            Core
-    #@TestGroup                 Core/SearchSizeLimit
+    #@TestGroup                 Core
     #@TestScript                CoreSearchSizeLimitTests.java
-    #@TestHTMLLink              blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Core functional tests for search size limits.
@@ -55,8 +55,8 @@
     #@TestID                    CoreSearchSizeLimit1
     #@TestPreamble
     #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
-                                with a search size limit defined in the command
-				line and the search size is exceeded.
+                                with size limit (150) against 151 entries.
+				The client binds as cn=Directory Manager.
     #@TestPostamble
     #@TestResult                Success if OpenDS returns 4
 */
@@ -91,6 +91,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 2
+    #@TestID                    CoreSearchSizeLimit2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with size limit (151) against 151 entries.
+				The client binds as cn=Directory Manager.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a search size limit defined in the command line and the search
@@ -122,6 +135,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 3
+    #@TestID                    CoreSearchSizeLimit3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filenename to the appropriate ldif file.
+				The ds-cfg-size-limit parameter is changed to
+				5 under cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Change the server-wide search size limit to 5.
  *
@@ -152,6 +179,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 4
+    #@TestID                    CoreSearchSizeLimit4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with size limit (5) against many entries.
+				The client binds as anonymous.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 4
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a search size limit defined by the server-wide parameter,
@@ -183,6 +223,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 5
+    #@TestID                    CoreSearchSizeLimit5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filenename to the appropriate ldif file.
+				The ds-cfg-size-limit parameter is changed to
+				10000 under cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Change the server-wide search size limit to 1000.
  *
@@ -213,6 +267,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 6
+    #@TestID                    CoreSearchSizeLimit6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with size limit (10000) against less than 10000 entries.
+				The client binds as anonymous.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a search size limit defined by the server-wide parameter,
@@ -244,6 +311,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 7
+    #@TestID                    CoreSearchSizeLimit7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filenename to the appropriate ldif file.
+				The ds-rlim-size-limit is changed to 5 under
+				cn=Directory Manager,cn=Root DNs,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Change the search size limit for cn=Directory Manager to 5.
  *
@@ -274,6 +355,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 8
+    #@TestID                    CoreSearchSizeLimit8
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with user size limit (5) for user,
+				cn=Directory Manager, against many entries.
+				The client binds as cn=Directory Manager.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 4
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a user search size limit defined by the user-specific parameter,
@@ -305,6 +400,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 9
+    #@TestID                    CoreSearchSizeLimit9
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with user size limit (5) for user,
+				cn=Directory Manager, against many entries.
+				The client binds as anonymous.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a user search size limit defined by the user-specific parameter,
@@ -336,6 +445,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 10
+    #@TestID                    CoreSearchSizeLimit10
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filenename to the appropriate ldif file.
+				The ds-rlim-size-limit is changed to -1 under
+				cn=Directory Manager,cn=Root DNs,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Change the search size limit for cn=Directory Manager to -1.
  *
@@ -366,6 +489,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Size Limit
+    #@TestName                  Search Size Limit 11
+    #@TestID                    CoreSearchSizeLimit11
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with user size limit (-1) against many entries.
+				The client binds as cn=Directory Manager.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a user search size limit defined as "unlimited" by the user-specific 
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java
index a6c7007..8280541 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreSearchTimeLimitTests.java
@@ -37,9 +37,9 @@
     #@TestSuitePurpose          To check that the search time limit is enforced.
     #@TestSuiteID               Search Time Limit
     #@TestSuiteGroup            Core
-    #@TestGroup                 Core/SearchTimeLimit
+    #@TestGroup                 Core
     #@TestScript                CoreSearchTimeLimitTests.java
-    #@TestHTMLLink              blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Core functional tests for search size limits.
@@ -47,6 +47,19 @@
 @Test
 public class CoreSearchTimeLimitTests extends CoreTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 1
+    #@TestID                    CoreSearchTimeLimit1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with time limit (1) against 1150 entries.
+                                The client binds as cn=Directory Manager.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 3
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a search time limit defined in the command line and the search time is exceeeded.
@@ -77,6 +90,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 2
+    #@TestID                    CoreSearchTimeLimit2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with time limit (100) against 1150 entries.
+                                The client binds as cn=Directory Manager.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a search time limit defined in the command line and the search time 
@@ -108,6 +134,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 3
+    #@TestID                    CoreSearchTimeLimit3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filenename to the appropriate ldif file.
+                                The ds-cfg-time-limit parameter is changed to
+                                1 under cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Change the server-wide search time limit to 1.
  *
@@ -138,6 +178,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 4
+    #@TestID                    CoreSearchTimeLimit4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with time limit (1) against 1150 entries.
+                                The client binds as anonymous.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 3
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a search time limit defined by the server-wide parameter,
@@ -169,6 +222,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 5
+    #@TestID                    CoreSearchTimeLimit5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filenename to the appropriate ldif file.
+                                The ds-cfg-time-limit parameter is changed to
+                                60 under cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Change the server-wide search time limit to 60.
  *
@@ -199,6 +266,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 6
+    #@TestID                    CoreSearchTimeLimit6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with time limit (60) against 1150 entries.
+                                The client binds as anonymous.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a search time limit defined by the server-wide parameter,
@@ -230,6 +310,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 7
+    #@TestID                    CoreSearchTimeLimit7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filenename to the appropriate ldif file.
+                                The ds-rlim-time-limit parameter is changed to
+                                1 under cn=Directory Manager,cn=Root,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Change the user search time limit for cn=Directory Manager to 1.
  *
@@ -260,6 +354,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 8
+    #@TestID                    CoreSearchTimeLimit8
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with time limit (1) for user,
+				cn=Directory Manager, against 1150 entries.
+                                The client binds as cn=Directory Manager.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 3
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a user search time limit defined by the user-specific parameter,
@@ -291,6 +399,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 9
+    #@TestID                    CoreSearchTimeLimit9
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with time limit (1) for user,
+				cn=Directory Manager, against 1150 entries.
+                                The client binds as anonymous.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a user search time limit defined by the user-specific parameter,
@@ -322,6 +444,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 10
+    #@TestID                    CoreSearchTimeLimit10
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filenename to the appropriate ldif file.
+                                The ds-rlim-time-limit parameter is changed to
+                                60 under cn=Directory Manager,cn=Root,cn=config.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Change the user search time limit for cn=Directory Manager to 60.
  *
@@ -352,6 +488,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Search Time Limit
+    #@TestName                  Search Time Limit 11
+    #@TestID                    CoreSearchTimeLimit11
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with time limit (60) for user,
+				cn=Directory Manager, against 1150 entries.
+                                The client binds as cn=Directory Manager.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  with a user search time limit defined by the user-specific parameter,
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java
index 74428ec..ea5df1a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreStartupTests.java
@@ -36,9 +36,9 @@
     #@TestSuitePurpose          Setup methods for core server test suites
     #@TestSuiteID               Setup
     #@TestSuiteGroup            Core
-    #@TestGroup                 Core/Setup
+    #@TestGroup                 Core
     #@TestScript                CoreStartupTests.java
-    #@TestHTMLLink              blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Core startup.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java
index 0662c5a..9d69e4e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreTFFiltersTests.java
@@ -37,9 +37,9 @@
     #@TestSuitePurpose          To check that true/false filters are correctly handled
     #@TestSuiteID               True/False Filters
     #@TestSuiteGroup            Core
-    #@TestGroup                 Core/TFFFilters
+    #@TestGroup                 Core
     #@TestScript                CoreTFFFiltersTests.java
-    #@TestHTMLLink              blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Core true/false filter tests. 
@@ -47,9 +47,22 @@
 @Test
 public class CoreTFFiltersTests extends CoreTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core True/False Filters
+    #@TestName                  True/False Filters 1
+    #@TestID                    CoreTFFilters1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                for entry, cn=version,cn=monitor, with the
+				single ampersand filter.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
- *  with a single ampersand character ("&").
+ *  with a single ampersand character.
  *
  *  @param  hostname               The hostname for the server where OpenDS
  *                                 is installed.
@@ -77,9 +90,22 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core True/False Filters
+    #@TestName                  True/False Filters 2
+    #@TestID                    CoreTFFilters2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                for entry, cn=version,cn=monitor, with the
+				single pipe filter.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
- *  with a single pipe character ("|").
+ *  with a single pipe character.
  *
  *  @param  hostname               The hostname for the server where OpenDS
  *                                 is installed.
@@ -107,9 +133,22 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core True/False Filters
+    #@TestName                  True/False Filters 3
+    #@TestID                    CoreTFFilters3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                for a non-existent entry with the
+				single ampersand filter.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
- *  with a single ampersand character ("&") for a non-existent entry.
+ *  with a single ampersand character for a non-existent entry.
  *
  *  @param  hostname               The hostname for the server where OpenDS
  *                                 is installed.
@@ -137,9 +176,22 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core True/False Filters
+    #@TestName                  True/False Filters 4
+    #@TestID                    CoreTFFilters4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                for a non-existent entry with the
+				single pipe filter.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
- *  with a single pipe character ("|") for a non-existent entry.
+ *  with a single pipe character for a non-existent entry.
  *
  *  @param  hostname               The hostname for the server where OpenDS
  *                                 is installed.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java
index 1a18202..122c29d 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/core/CoreVersionReportTests.java
@@ -33,13 +33,13 @@
 
 /*
     Place suite-specific test information here.
-    #@TestSuiteName             Server Version Reporting
+    #@TestSuiteName             Core Server Version Reporting
     #@TestSuitePurpose          To check that the server version reporting is correct
     #@TestSuiteID               Server Version Reporting
     #@TestSuiteGroup            Core
-    #@TestGroup                 Core/VersionReport
+    #@TestGroup                 Core
     #@TestScript                CoreVersionReportTests.java
-    #@TestHTMLLink              blahblah
+    #@TestHTMLLink
 */
 /**
  * This class contains the TestNG tests for the Core version reporting tests. 
@@ -47,6 +47,18 @@
 @Test
 public class CoreVersionReportTests extends CoreTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Core Server Version Reporting
+    #@TestName                  Version Report 1
+    #@TestID                    CoreVersionReport1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                for entry, cn=version,cn=monitor.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when an ldap search request is conducted
  *  for the current version of OpenDS.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java
index b9db670..18969ab 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_binds.java
@@ -31,12 +31,34 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2251 Binds
+    #@TestSuitePurpose          Test the RFC2251 standards regarding binds
+    #@TestSuiteID               RFC2251 Binds
+    #@TestSuiteGroup            RFC2251 Binds
+    #@TestGroup                 RFC2251 Binds
+    #@TestScript                FrontendRFC2251_binds.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for binds.
  */
 @Test
 public class FrontendRFC2251_binds extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Binds
+    #@TestName                  Frontend User Bind 1
+    #@TestID                    FrontendUserBind1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                binding as anonymous.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when a search request is conducted
  *  with an anonymous bind.
@@ -67,6 +89,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Binds
+    #@TestName                  Frontend User Bind 2
+    #@TestID                    FrontendUserBind2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                binding as uid=scarter,ou=People,o=frontend tests,
+				dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when a search request is conducted
  *  as one of the users.
@@ -97,6 +132,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Binds
+    #@TestName                  Frontend User Bind 3
+    #@TestID                    FrontendUserBind3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                binding as uid=scarter,ou=People,o=frontend tests,
+				dc=example,dc=com, but with the wrong password.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 1
+*/
 /**
  *  Check the response of OpenDS when a search request is conducted
  *  when binding as one of the users but with a bad password.
@@ -127,6 +175,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Binds
+    #@TestName                  Frontend User Bind 4
+    #@TestID                    FrontendUserBind4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                binding as uid=scarter,ou=People,o=frontend tests,
+				dc=example,dc=com, but with a null password.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 1
+*/
 /**
  *  Check the response of OpenDS when a search request is conducted
  *  when binding as one of the users but with a null password.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java
index b950c99..687497a 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_compares.java
@@ -31,12 +31,33 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2251 Compares
+    #@TestSuitePurpose          Test the RFC2251 standards regarding compares
+    #@TestSuiteID               RFC2251 Compares
+    #@TestSuiteGroup            RFC2251 Compares
+    #@TestGroup                 RFC2251 Compares
+    #@TestScript                FrontendRFC2251_compares.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for compare.
  */
 @Test
 public class FrontendRFC2251_compares extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Compares
+    #@TestName                  Frontend User Compare 1
+    #@TestID                    FrontendUserCompare1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare().
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when a compare request is conducted
  *  for an entry with one of its attributes and the attribute value.
@@ -67,6 +88,17 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Compares
+    #@TestName                  Frontend User Compare 2
+    #@TestID                    FrontendUserCompare2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare().
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when a compare request is conducted
  *  for an entry with one of its attributes and the wrong attribute value.
@@ -97,6 +129,17 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Compares
+    #@TestName                  Frontend User Compare 3
+    #@TestID                    FrontendUserCompare3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare().
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 16
+*/
 /**
  *  Check the response of OpenDS when a compare request is conducted
  *  for an entry with a non-existent attribute and the attribute value.
@@ -127,6 +170,17 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Compares
+    #@TestName                  Frontend User Compare 4
+    #@TestID                    FrontendUserCompare4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare().
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Check the response of OpenDS when a compare request is conducted
  *  for a non-existent entry.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java
index 7d50763..4d2f67e 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_deletes.java
@@ -31,12 +31,35 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2251 Deletes
+    #@TestSuitePurpose          Test the RFC2251 standards regarding deletes
+    #@TestSuiteID               RFC2251 Deletes
+    #@TestSuiteGroup            RFC2251 Deletes
+    #@TestGroup                 RFC2251 Deletes
+    #@TestScript                FrontendRFC2251_deletes.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for deletes.
  */
 @Test
 public class FrontendRFC2251_deletes extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 1 precheck
+    #@TestID                    FrontendUserDelete1_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+				with base DN, uid=jvedder,ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check for the existence of the entry which will be deleted in the next test.
  *
@@ -66,6 +89,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 1 
+    #@TestID                    FrontendUserDelete1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+				with base DN, uid=jvedder,ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when a delete request is conducted
  *  for an existing entry.
@@ -96,6 +132,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 1 check entry
+    #@TestID                    FrontendUserDelete1_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+				with base DN, uid=jvedder,ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Check for the existence of the entry which was deleted in the last test.
  *
@@ -125,6 +174,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 2 precheck
+    #@TestID                    FrontendUserDelete2_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+				with base DN, uid=mtyler,ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check for the existence of the entry as a precheck for the next test.
  *
@@ -154,6 +216,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 2 
+    #@TestID                    FrontendUserDelete2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+				with base DN, uid=mtyler,ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 66
+*/
 /**
  *  Check the response of OpenDS when a delete request is conducted
  *  for  branch.
@@ -184,6 +259,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 2 check entry
+    #@TestID                    FrontendUserDelete2_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+				with base DN, uid=mtyler,ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check for the existence of the entry that should still be present
  *  after the last test.
@@ -214,6 +302,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 3 precheck
+    #@TestID                    FrontendUserDelete3_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+				with base DN, uid=mtyler,ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check for the existence of the entry as a precheck for the next test.
  *
@@ -243,6 +344,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 3 
+    #@TestID                    FrontendUserDelete3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPDelete.mainDelete()
+				with the parameter, -x, on ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the response of OpenDS when a delete request is conducted
  *  on a branck using the "-x" parameter.
@@ -273,6 +387,19 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Deletes
+    #@TestName                  Frontend User Delete 3 check entry
+    #@TestID                    FrontendUserDelete3_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+				with base DN, uid=mtyler,ou=People,ou=deletes,
+				o=frontend tests,dc=example,dc=com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Check for the existence of the entry that should have been deleted
  *  after the last test.
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java
index 2daafe4..08f27ed 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifies.java
@@ -31,12 +31,36 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2251 Modifies
+    #@TestSuitePurpose          Test the RFC2251 standards regarding modifies
+    #@TestSuiteID               RFC2251 Modifies
+    #@TestSuiteGroup            RFC2251 Modifies
+    #@TestGroup                 RFC2251 Modifies
+    #@TestScript                FrontendRFC2251_modifies.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for modifies.
  */
 @Test
 public class FrontendRFC2251_modifies extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 1 precheck
+    #@TestID                    FrontendUserModify1_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=scarter,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				st, with value, Calfornia.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 16
+*/
 /**
  *  Check an entry for a non-existent attribute which will be added 
  *  in the next test.
@@ -66,7 +90,18 @@
 
     compareExitCode(retCode, expCode);
   }
-
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 1
+    #@TestID                    FrontendUserModify1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an attribute to an existing entry.
  *
@@ -97,6 +132,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 1 check entry
+    #@TestID                    FrontendUserModify1_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=scarter,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				st, with value, Calfornia.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check an entry for  the attribute that was added in the last test.
  *
@@ -126,6 +175,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 2 precheck
+    #@TestID                    FrontendUserModify2_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=tmorris,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				mail, with value, tmorris@example.com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check an entry for an existing attribute which will be deleted 
  *  in the next test.
@@ -156,6 +219,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 2
+    #@TestID                    FrontendUserModify2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete an attribute from an existing entry.  
  *
@@ -186,6 +261,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 2 check entry
+    #@TestID                    FrontendUserModify2_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=tmorris,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				mail, with value, tmorris@example.com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 16
+*/
 /**
  *  Check an entry for an attribute that was deleted in the last test.
  *
@@ -215,6 +304,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 3 precheck
+    #@TestID                    FrontendUserModify3_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=kvaughn,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				l, with value, Sunnyvale.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check an entry for an existing attribute which will be replaced 
  *  in the next test.
@@ -245,6 +348,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 3
+    #@TestID                    FrontendUserModify3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Replace an attribute in an existing entry.
  *
@@ -275,6 +390,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 3 check entry
+    #@TestID                    FrontendUserModify3_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=kvaughn,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				l, with value, Grenoble.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check an entry for an existing attribute which was replaced 
  *  in the last test.
@@ -305,6 +434,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 4 precheck
+    #@TestID                    FrontendUserModify4_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=kvaughn,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				st, with value, California.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 16
+*/
 /**
  *  Check an entry for a non-existent attribute which will be added 
  *  in the next test.
@@ -335,6 +478,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 4
+    #@TestID                    FrontendUserModify4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an attribute to an existing entry by a replace operation.
  *
@@ -365,6 +520,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 4 check entry
+    #@TestID                    FrontendUserModify4_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=kvaughn,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				st, with value, California.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check an entry for the attribute which was added 
  *  in the last test.
@@ -395,6 +564,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 5 precheck
+    #@TestID                    FrontendUserModify5_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=abergin,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				mail, with value, abergin@example.com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check an entry for an existing attribute which will be deleted 
  *  in the next test.
@@ -425,6 +608,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 5
+    #@TestID                    FrontendUserModify5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete an attribute from an existing entry by a replace operation.
  *
@@ -455,6 +650,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 5 check entry
+    #@TestID                    FrontendUserModify5_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=abergin,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				mail, with value, abergin@example.com.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 16
+*/
 /**
  *  Check an entry for an attribute which was deleted 
  *  in the last test.
@@ -485,6 +694,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 6 precheck
+    #@TestID                    FrontendUserModify6_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=dmiller,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				st, with value, California.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 16
+*/
 /**
  *  Check an entry for a non-existent attribute.
  *
@@ -514,6 +737,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 6
+    #@TestID                    FrontendUserModify6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Modify a non-existent attribute in an existing entry.
  *
@@ -544,6 +779,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 6 check entry
+    #@TestID                    FrontendUserModify6_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=dmiller,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				st, with value, California.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 16
+*/
 /**
  *  Check the entry was modified in the last test.
  *
@@ -573,6 +822,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 7 precheck
+    #@TestID                    FrontendUserModify7_precheck
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=dmiller,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				uid, with value, dmiller.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check an entry for a required attribute.
  *
@@ -602,6 +865,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 7
+    #@TestID                    FrontendUserModify7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Delete a required attribute in an existing entry.
  *
@@ -632,6 +907,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modifies
+    #@TestName                  Frontend User Modify 7 check entry
+    #@TestID                    FrontendUserModify7_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPCompare.mainCompare()
+                                with base DN, uid=dmiller,ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+				uid, with value, dmiller.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the entry was modified in the last test.
  *
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java
index 8968179..4c291e4 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendRFC2251_modifyrdns.java
@@ -31,12 +31,34 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend RFC2251 Modify RDNs
+    #@TestSuitePurpose          Test the RFC2251 standards regarding modify RDNs
+    #@TestSuiteID               RFC2251 Modify RDNs
+    #@TestSuiteGroup            RFC2251 Modify RDNs
+    #@TestGroup                 RFC2251 Modify RDNs
+    #@TestScript                FrontendRFC2251_modifyrdns.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend functional tests for modify RDNs.
  */
 @Test
 public class FrontendRFC2251_modifyrdns extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modify RDNs
+    #@TestName                  Frontend User Modify RDN 1
+    #@TestID                    FrontendUserModifyRDN1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Modify the RDN for an existing entry and retain the old RDN.
  *
@@ -67,6 +89,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modify RDNs
+    #@TestName                  Frontend User Modify RDN 1 check entry
+    #@TestID                    FrontendUserModifyRDN1_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+                                uid, with value, kwintersmith.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the entry that was modified in the last test.
  *
@@ -96,6 +132,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modify RDNs
+    #@TestName                  Frontend User Modify RDN 2
+    #@TestID                    FrontendUserModifyRDN2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Modify the RDN for an existing entry and delete the old RDN.
  *
@@ -126,6 +174,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modify RDNs
+    #@TestName                  Frontend User Modify RDN 2 check entry
+    #@TestID                    FrontendUserModifyRDN2_checkentry
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPSearch.mainSearch()
+                                with base DN, ou=People,
+                                o=frontend tests,dc=example,dc=com and attribute,
+                                uid, with value, kwintersmith.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Check the entry that was modified in the last test.
  *
@@ -155,6 +217,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modify RDNs
+    #@TestName                  Frontend User Modify RDN 3
+    #@TestID                    FrontendUserModifyRDN3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 32
+*/
 /**
  *  Modify the RDN for non-existent entry.
  *
@@ -185,6 +259,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend RFC2251 Modify RDNs
+    #@TestName                  Frontend User Modify RDN 4
+    #@TestID                    FrontendUserModifyRDN4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 68
+*/
 /**
  *  Modify the RDN for an existing entry to the RDN of another existing entry.
  *
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java
index 818ce39..898e3ee 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/frontend/FrontendStartupTests.java
@@ -30,12 +30,34 @@
 import org.testng.annotations.*;
 import org.opends.server.tools.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Frontend Setup
+    #@TestSuitePurpose          Setup methods for the Frontend test suites
+    #@TestSuiteID               Setup
+    #@TestSuiteGroup            Frontend
+    #@TestGroup                 Frontend
+    #@TestScript                FrontendStartupTests.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Frontend startup.
  */
 @Test
 public class FrontendStartupTests extends FrontendTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Frontend Setup
+    #@TestName                  Frontend Setup 1
+    #@TestID                    FrontendStartup1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add entries that are required for the Frontend Tests.
  *
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java
index 3e77d31..eaac2ce 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/quickstart/QuickstartAddTests.java
@@ -30,12 +30,35 @@
 import org.testng.annotations.*;
 import org.opends.server.tools.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Quickstart Setup
+    #@TestSuitePurpose          Perform basic tests to ensure that OpenDS is ready.
+    #@TestSuiteID               Quickstart
+    #@TestSuiteGroup            Quickstart
+    #@TestGroup                 Quickstart
+    #@TestScript                QuickstartAddTests.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the QuickstartAdd startup.
  */
 @Test
 public class QuickstartAddTests extends QuickstartTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Quickstart Setup
+    #@TestName                  Quickstart Setup 1
+    #@TestID                    Quickstart Add 1
+    #@TestPreamble
+    #@TestSteps                 Client calls checklogdir.sh on unix systems
+				and checklogdir.bat on Windows systems
+				with the java Runtime method, exec().
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  To make the directory for the OpenDS output that will be generated
  *  during the rest of the Integration Tests.
@@ -77,6 +100,18 @@
     compareExitCode(0, 0);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Quickstart Setup
+    #@TestName                  Quickstart Setup 2
+    #@TestID                    Quickstart Add 2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+				with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  To add "dc=example,dc=com" and several entries under that dn.
  *
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java
index a65a83d..1d9650f 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaRFCTests.java
@@ -31,12 +31,36 @@
 import org.opends.server.tools.*;
 import java.io.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Schema RFC Tests
+    #@TestSuitePurpose          Perform rfc-specific schema tests
+    #@TestSuiteID               Schema RFC tests
+    #@TestSuiteGroup            Schema
+    #@TestGroup                 Schema
+    #@TestScript                SchemaRFCTests.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Schema RFC tests.
  */
 @Test
 public class SchemaRFCTests extends SchemaTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 1
+    #@TestID                    Schema RFC Test 1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that has a 
+				labeledURI attribute.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by rfc 2079.
  *
@@ -67,6 +91,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 2
+    #@TestID                    Schema RFC Test 2
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that uses
+				dcObject objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by rfc 2247.
  *
@@ -97,6 +135,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 3
+    #@TestID                    Schema RFC Test 3
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that uses
+				domain objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by rfc 2247.
  *
@@ -127,6 +179,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 4
+    #@TestID                    Schema RFC Test 4
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that uses
+				dcObject objectclass, but has no structural
+				objectclass which is required.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add an entry that is covered by rfc 2247.
  *
@@ -157,6 +224,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 5
+    #@TestID                    Schema RFC Test 5
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that uses
+				dcObject objectclass, but lacks required attributes.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add an entry that is covered by rfc 2247.
  *
@@ -187,6 +268,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 6
+    #@TestID                    Schema RFC Test 6
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that uses
+				dcObject objectclass, but lacks required attributes
+				and lacks a required structural objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add an entry that is covered by rfc 2247.
  *
@@ -217,6 +313,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 7
+    #@TestID                    Schema RFC Test 7
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains entries that use
+				uid=, dc=, and cn= in the rdn.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by rfc 2377.
  *
@@ -247,6 +357,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 8
+    #@TestID                    Schema RFC Test 8
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains entries that use
+				inetorgperson objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by rfc 2798.
  *
@@ -277,6 +401,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 9
+    #@TestID                    Schema RFC Test 9
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				which modifies the vendorName attribute. 
+				The user should not be able to modify this attribute.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 53
+*/
 /**
  *  Modify an entry that is covered by rfc 3045.
  *
@@ -307,6 +446,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 10
+    #@TestID                    Schema RFC Test 10
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				which modifies the vendorVersion attribute. 
+				The user should not be able to modify this attribute.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 53
+*/
 /**
  *  Modify an entry that is covered by rfc 3045.
  *
@@ -337,6 +491,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 11
+    #@TestID                    Schema RFC Test 11
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses uddiBusinessEntity objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by rfc 4403.
  *
@@ -367,6 +535,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 12
+    #@TestID                    Schema RFC Test 12
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses uddiBusinessService objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by rfc 4403.
  *
@@ -397,6 +579,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 13
+    #@TestID                    Schema RFC Test 13
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses uddiBusinessService objectclass
+				but violates the DIT structure rule.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add an entry that is covered by rfc 4403.
  *
@@ -427,6 +624,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 14
+    #@TestID                    Schema RFC Test 14
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses uddiContact objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by rfc 4403.
  *
@@ -457,6 +668,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 15
+    #@TestID                    Schema RFC Test 15
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses uddiContact objectclass,
+				but violates the DIT structure rule.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add an entry that is covered by rfc 4403.
  *
@@ -487,6 +713,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 16
+    #@TestID                    Schema RFC Test 16
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses ipHost and device objectclasses.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-howard-rfc2307bis.
  *
@@ -517,6 +757,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 17
+    #@TestID                    Schema RFC Test 17
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses ipHost and device objectclasses,
+				but required attributes are missing.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add an entry that is violates draft-howard-rfc2307bis.
  *
@@ -547,6 +802,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 18
+    #@TestID                    Schema RFC Test 18
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses ipHost, device and bootabledevice
+				objectclasses.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-howard-rfc2307bis.
  *
@@ -577,6 +847,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 19
+    #@TestID                    Schema RFC Test 19
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses ipHost and device objectclasses,
+				but contains attributes for bootabledevice objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add an entry that is covered by draft-howard-rfc2307bis.
  *
@@ -607,6 +892,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 20
+    #@TestID                    Schema RFC Test 20
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses untypedobject objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-furseth-ldap-untypedobject.
  *
@@ -637,6 +936,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 21
+    #@TestID                    Schema RFC Test 21
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses changeLogEntry objectclass. The
+				change type for the log is add.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-good-ldap-changelog.
  *
@@ -667,6 +981,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 22
+    #@TestID                    Schema RFC Test 22
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses changeLogEntry objectclass. The
+				change type for the log is delete.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-good-ldap-changelog.
  *
@@ -697,6 +1026,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 23
+    #@TestID                    Schema RFC Test 23
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses changeLogEntry objectclass. The
+				change type for the log is modify.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-good-ldap-changelog.
  *
@@ -727,6 +1071,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 24
+    #@TestID                    Schema RFC Test 24
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses namedObject objectclass. 
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-howard-namedobject.
  *
@@ -757,6 +1115,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 25
+    #@TestID                    Schema RFC Test 25
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses namedObject objectclass, 
+				and contains other optional attributes. 
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-howard-namedobject.
  *
@@ -787,6 +1160,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 26
+    #@TestID                    Schema RFC Test 26
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses ldapSubEntry objectclass. 
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-ietf-ldup-subentry.
  *
@@ -817,6 +1204,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 27
+    #@TestID                    Schema RFC Test 27
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses ldapSubEntry and posixGroup objectclasses. 
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-ietf-ldup-subentry.
  *
@@ -847,6 +1248,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 28
+    #@TestID                    Schema RFC Test 28
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry
+				that uses ldapSubEntry and posixGroup objectclasses,
+				but contains an attribute defined as NO_USER_MODIFICATION. 
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 53
+*/
 /**
  *  Add an entry that is covered by draft-ietf-ldup-subentry.
  *
@@ -877,6 +1293,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 29
+    #@TestID                    Schema RFC Test 29
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Disable schema checking.
  *
@@ -907,6 +1335,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 30
+    #@TestID                    Schema RFC Test 30
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Enable schema checking.
  *
@@ -937,6 +1377,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 31
+    #@TestID                    Schema RFC Test 31
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Disable syntax checking.
  *
@@ -967,6 +1419,18 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 32
+    #@TestID                    Schema RFC Test 32
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Enable syntax checking.
  *
@@ -997,6 +1461,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 33
+    #@TestID                    Schema RFC Test 33
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that uses document
+				objectclass.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine.
  *
@@ -1027,6 +1505,21 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 34
+    #@TestID                    Schema RFC Test 34
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that uses document
+				objectclass, and contains additional optional
+				attributes.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine.
  *
@@ -1057,6 +1550,20 @@
     compareExitCode(retCode, expCode);
   }
 
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, must be present and must be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema RFC Tests
+    #@TestName                  Schema RFC Test 35
+    #@TestID                    Schema RFC Test 35
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+				The ldif file contains an entry that uses document
+				objectclass, but is missing required attributes.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 65
+*/
 /**
  *  Add an entry that is covered by draft-ietf-zeilenga-ldap-cosine.
  *
diff --git a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java
index 2506de3..bc20117 100644
--- a/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java
+++ b/opends/tests/integration-tests-testng/src/server/org/opends/server/integration/schema/SchemaStartupTests.java
@@ -30,12 +30,34 @@
 import org.testng.annotations.*;
 import org.opends.server.tools.*;
 
+/*
+    Place suite-specific test information here.
+    #@TestSuiteName             Schema Setup
+    #@TestSuitePurpose          Setup methods for the Schema test suites
+    #@TestSuiteID               Setup
+    #@TestSuiteGroup            Schema
+    #@TestGroup                 Schema
+    #@TestScript                SchemaStartupTests.java
+    #@TestHTMLLink
+*/
 /**
  * This class contains the TestNG tests for the Schema startup.
  */
 @Test
 public class SchemaStartupTests extends SchemaTests
 {
+/*
+    Place test-specific test information here.
+    The tag, TestMarker, be the same as the marker, TestSuiteName.
+    #@TestMarker                Schema Setup
+    #@TestName                  Schema Setup 1
+    #@TestID                    SchemaStartup1
+    #@TestPreamble
+    #@TestSteps                 Client calls static method LDAPModify.mainModify()
+                                with the filename to the appropriate ldif file.
+    #@TestPostamble
+    #@TestResult                Success if OpenDS returns 0
+*/
 /**
  *  Add entries that are required for the Schema Tests.
  *

--
Gitblit v1.10.0