--- a/test-suite/index.html	Thu Aug 01 10:16:42 2013 +0200
+++ b/test-suite/index.html	Thu Aug 01 10:27:18 2013 +0200
@@ -13,7 +13,6 @@
   <link rel="stylesheet" type="text/css" href="../static/css/bootstrap/bootstrap-responsive.css">
   <link rel="stylesheet" type="text/css" href="../static/css/bootstrap/font-awesome.css">
   <link rel="shortcut icon" href="../favicon.ico" />
-  <link href="../site.css" rel="stylesheet" type="text/css" />
   <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
   <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/1.0.0-rc.3/handlebars.min.js"></script>
   <script id="manifest" tile="application/ld+json" src="manifest.jsonld"></script>
@@ -106,10 +105,10 @@
             can be compared using JSON object comparison with the processor output.</li>
           <li><em>normalize</em> tests have <em>input</em> and <em>expected</em> documents. The <em>expected</em> results
             can be compared using string comparison with the processor output.</li>
-          <li><em>rdf</em> tests have <em>input</em> and <em>sparql</em> documents. The results are tested
-            by performing the RDF conversion and using this as the default document for an <code>ASK</code> query
-            contained within the <em>sparql</em> document using a SPARQL endpoint. The end result is a
-            yes/no on whether the expected triples were extracted by the JSON-LD processor.</li>
+          <li><em>toRdf</em> tests have <em>input</em> and <em>expected</em> documents. The <em>expected</em> results
+            can be compared using string comparison with the processor output.</li>
+          <li><em>fromRdf</em> tests have <em>input</em> and <em>expected</em> documents. The <em>expected</em> results
+            can be compared using JSON object comparison with the processor output.</li>
           </ul>
         </section>
       </div>
@@ -120,21 +119,19 @@
       <div class="row">
         <section class="offset2 span8">
           <p>If you would like to contribute a new test or a fix to an existing test,
-          please follow these steps:</p>
+            please follow these steps:</p>
 
           <ol>
-          <li>Notify the JSON-LD mailing list, public-linked-json@w3.org,
-          that you will be creating a new test or fix and the purpose of the
-          change.</li>
-          <li>Clone the git repository: git://github.com/json-ld/json-ld.org.git</li>
-          <li>Make your changes and submit them via github, or via a &#8216;git format-patch&#8217;
-          to the <a href="mailto:public-linked-json@w3.org">JSON-LD mailing list</a>.</li>
+            <li>Notify the JSON-LD mailing list, public-linked-json@w3.org, that
+              you will be creating a new test or fix and the purpose of the change.</li>
+            <li>Clone the git repository: git://github.com/json-ld/json-ld.org.git</li>
+            <li>Make your changes and submit them via GitHub, or via a &#8216;git format-patch&#8217;
+              to the <a href="mailto:public-linked-json@w3.org">JSON-LD mailing list</a>.</li>
           </ol>
 
           <p>Optionally, you can ask for direct access to the repository and may make
-          changes directly to the JSON-LD Test Suite source code. All updates to the test
-          suite go live on Digital Bazaar&#8217;s JSON-LD Test Suite site within seconds of
-          committing changes to github via a WebHook call.</p>
+            changes directly to the JSON-LD Test Suite source code. All updates to the test
+            suite go live within seconds of committing the changes to GitHub via a WebHook call.</p>
         </section>
       </div>
 
@@ -146,20 +143,20 @@
           <p>In order to add a unit test, you must follow these steps:</p>
 
           <ol>
-          <li>Pick a new unit test number. For example - 250. To be consistent, please use
-          the next available unit test number.</li>
-          <li>Create a markup file in the tests/ directory with a .jsonld extension.
-          For example: tests/rdf-250.jsonld</li>
-          <li>Create a SPARQL query file in the tests/ directory with a .jsonld or .sparql extension.
-          For example: tests/rdf-250.sparql</li>
-          <li>Add your test to manifest.jsonld.</li>
+            <li>Pick a new unit test number. For example - 250. To be consistent, please use
+              the next available unit test number.</li>
+            <li>Create a the input file in the tests/ directory with a .jsonld extension.
+              For example: tests/expand-0250-in.jsonld</li>
+            <li>Create a file containing the expected result in the tests/ directory with a
+              .jsonld or .nq extension. For example: tests/expand-0250-out.jsonld</li>
+            <li>Add your test to the corresponding xxx-manifest.jsonld.</li>
           </ol>
 
           <p>The test suite is designed to empower JSON-LD processor maintainers to create
-          and add tests as they see fit. This may mean that the test suite may become
-          unstable from time to time, but this approach has been taken so that the
-          long-term goal of having a comprehensive test suite for JSON-LD can be achieved
-          by the JSON-LD community.</p>
+            and add tests as they see fit. This may mean that the test suite may become
+            unstable from time to time, but this approach has been taken so that the
+            long-term goal of having a comprehensive test suite for JSON-LD can be achieved
+            by the JSON-LD community.</p>
         </section>
       </div>
 
@@ -178,7 +175,7 @@
 </div>
 
 <!-- Script tags -->
-<script type="text/javascript" src="static/js/bootstrap/bootstrap.js"></script>
+<script type="text/javascript" src="../static/js/bootstrap/bootstrap.js"></script>
 <script type="text/javascript">
 function load_manifests() {
   Handlebars.registerHelper('number', function(that) {