diff --git a/src/test/test-tabs.html b/src/test/test-tabs.html
index ab557cb97..5d5404533 100644
--- a/src/test/test-tabs.html
+++ b/src/test/test-tabs.html
@@ -12,7 +12,7 @@
   <link type="text/css" rel="stylesheet" href=
   "https://linkeddata.github.io/tabulator-firefox/content/tabbedtab.css" />
 
-  <style type="application/javascript">
+  <style type="text/css">
 <![CDATA[
 
   input { background-color: #eef; padding: 0.5em;  border: .5em solid white; font-size: 120%; };
@@ -31,7 +31,7 @@
   ]]>
   </style>
   <script type="text/javascript" src=
-  "../../../mashlib/dist/mashlib-prealpha.js">
+  "../../../mashlib/dist/mashlib.js">
 </script>
 <!-- "https://linkeddata.github.io/app-schedule/schedule.js" -->
 
@@ -74,7 +74,7 @@ <h2>Test Tabs widget</h2>
   trip:attachmentList ( &lt;http://aclu.org/&gt; &lt;http://cnn.com/&gt; &lt;https://webfoundation.org/&gt; ) .
 
 #ends
- 
+
 </pre>
           </td>
 
@@ -91,7 +91,7 @@ <h2>Test Tabs widget</h2>
       ui:subject &lt;#it&gt;.
     &lt;#it&gt;
       trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;https://webfoundation.org/&gt; ) .
-  
+
 </pre>
           </td>
 
@@ -108,7 +108,7 @@ <h2>Test Tabs widget</h2>
        ui:subject &lt;#it&gt;.
      &lt;#it&gt;
        trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt; ) .
-   
+
 </pre>
           </td>
 
@@ -125,7 +125,7 @@ <h2>Test Tabs widget</h2>
         ui:subject &lt;#it&gt;.
       &lt;#it&gt;
         trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt; ) .
-    
+
 </pre>
           </td>
 
@@ -144,7 +144,7 @@ <h2>Test Tabs widget</h2>
          trip:attachmentList ( &lt;http://acm.org/&gt;  &lt;http://aclu.org/&gt;
          &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt;
          &lt;http://www.zenith.org/&gt; ) .
-     
+
 </pre>
           </td>
 
@@ -169,7 +169,7 @@ <h2>Test Tabs widget</h2>
           &lt;http://aclu.org/&gt;
           &lt;http://acm.org/&gt;
            ) .
-      
+
 </pre>
           </td>
 
@@ -186,7 +186,7 @@ <h2>Test Tabs widget</h2>
         ui:subject &lt;#it&gt;.
       &lt;#it&gt;
         trip:attachmentList ( &lt;https://webfoundation.org/&gt; ) .
-    
+
 </pre>
           </td>
 
@@ -202,7 +202,7 @@ <h2>Test Tabs widget</h2>
          ui:subject &lt;#it&gt;.
        &lt;#it&gt;
          trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;https://webfoundation.org/&gt; ) .
-     
+
 </pre>
           </td>
 
@@ -219,7 +219,7 @@ <h2>Test Tabs widget</h2>
            ui:subject &lt;#it&gt;.
          &lt;#it&gt;
            trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;https://webfoundation.org/&gt; ) .
-       
+
 </pre>
           </td>
 
@@ -236,7 +236,7 @@ <h2>Test Tabs widget</h2>
             ui:subject &lt;#it&gt;.
           &lt;#it&gt;
             trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt; ) .
-        
+
 </pre>
           </td>
 
@@ -253,7 +253,7 @@ <h2>Test Tabs widget</h2>
              ui:subject &lt;#it&gt;.
            &lt;#it&gt;
              trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt; ) .
-         
+
 </pre>
           </td>
 
@@ -272,7 +272,7 @@ <h2>Test Tabs widget</h2>
               trip:attachmentList ( &lt;http://acm.org/&gt;  &lt;http://aclu.org/&gt;
               &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt;
               &lt;http://www.zenith.org/&gt; ) .
-          
+
 </pre>
           </td>
 
@@ -297,7 +297,7 @@ <h2>Test Tabs widget</h2>
                &lt;http://aclu.org/&gt;
                &lt;http://acm.org/&gt;
                 ) .
-           
+
 </pre>
           </td>
 
@@ -314,7 +314,7 @@ <h2>Test Tabs widget</h2>
              ui:subject &lt;#it&gt;.
            &lt;#it&gt;
              trip:attachmentList ( &lt;https://webfoundation.org/&gt; ) .
-         
+
 </pre>
           </td>
 
@@ -330,7 +330,7 @@ <h2>Test Tabs widget</h2>
               ui:subject &lt;#it&gt;.
             &lt;#it&gt;
               trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;https://webfoundation.org/&gt; ) .
-          
+
 </pre>
           </td>
 
@@ -347,7 +347,7 @@ <h2>Test Tabs widget</h2>
                 ui:subject &lt;#it&gt;.
               &lt;#it&gt;
                 trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;https://webfoundation.org/&gt; ) .
-            
+
 </pre>
           </td>
 
@@ -364,7 +364,7 @@ <h2>Test Tabs widget</h2>
                  ui:subject &lt;#it&gt;.
                &lt;#it&gt;
                  trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt; ) .
-             
+
 </pre>
           </td>
 
@@ -381,7 +381,7 @@ <h2>Test Tabs widget</h2>
                   ui:subject &lt;#it&gt;.
                 &lt;#it&gt;
                   trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt; ) .
-              
+
 </pre>
           </td>
 
@@ -400,7 +400,7 @@ <h2>Test Tabs widget</h2>
                    trip:attachmentList ( &lt;http://acm.org/&gt;  &lt;http://aclu.org/&gt;
                    &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt;
                    &lt;http://www.zenith.org/&gt; ) .
-               
+
 </pre>
           </td>
 
@@ -425,7 +425,7 @@ <h2>Test Tabs widget</h2>
                     &lt;http://aclu.org/&gt;
                     &lt;http://acm.org/&gt;
                      ) .
-                
+
 </pre>
           </td>
 
@@ -442,7 +442,7 @@ <h2>Test Tabs widget</h2>
                   ui:subject &lt;#it&gt;.
                 &lt;#it&gt;
                   trip:attachmentList ( &lt;https://webfoundation.org/&gt; ) .
-              
+
 </pre>
           </td>
 
@@ -458,7 +458,7 @@ <h2>Test Tabs widget</h2>
        ui:subject &lt;#it&gt;.
      &lt;#it&gt;
        trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;https://webfoundation.org/&gt; ) .
-   
+
 </pre>
           </td>
 
@@ -475,7 +475,7 @@ <h2>Test Tabs widget</h2>
          ui:subject &lt;#it&gt;.
        &lt;#it&gt;
          trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;https://webfoundation.org/&gt; ) .
-     
+
 </pre>
           </td>
 
@@ -492,7 +492,7 @@ <h2>Test Tabs widget</h2>
           ui:subject &lt;#it&gt;.
         &lt;#it&gt;
           trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt; ) .
-      
+
 </pre>
           </td>
 
@@ -509,7 +509,7 @@ <h2>Test Tabs widget</h2>
            ui:subject &lt;#it&gt;.
          &lt;#it&gt;
            trip:attachmentList ( &lt;http://aclu.org/&gt;  &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt; ) .
-       
+
 </pre>
           </td>
 
@@ -528,7 +528,7 @@ <h2>Test Tabs widget</h2>
             trip:attachmentList ( &lt;http://acm.org/&gt;  &lt;http://aclu.org/&gt;
             &lt;http://bbc.co.uk/&gt;  &lt;http://cbc.ca/&gt;  &lt;http://dbp.de/&gt;  &lt;https://webfoundation.org/&gt;
             &lt;http://www.zenith.org/&gt; ) .
-        
+
 </pre>
           </td>
 
@@ -553,7 +553,7 @@ <h2>Test Tabs widget</h2>
              &lt;http://aclu.org/&gt;
              &lt;http://acm.org/&gt;
               ) .
-         
+
 </pre>
           </td>
 
@@ -570,7 +570,7 @@ <h2>Test Tabs widget</h2>
            ui:subject &lt;#it&gt;.
          &lt;#it&gt;
            trip:attachmentList ( &lt;https://webfoundation.org/&gt; ) .
-       
+
 </pre>
           </td>
 
diff --git a/src/test/test-tabs.js b/src/test/test-tabs.js
index ef6db6647..ee8ca3c93 100644
--- a/src/test/test-tabs.js
+++ b/src/test/test-tabs.js
@@ -2,7 +2,7 @@
 document.addEventListener('DOMContentLoaded', function () {
     /// ///////////////////////////////////////////
 
-  var UI = require('mashlib')
+  var UI = panes.UI
   var kb = UI.store
   var dom = document
 
@@ -48,7 +48,8 @@ document.addEventListener('DOMContentLoaded', function () {
       options.subject = kb.the(target, UI.ns.ui('subject'))
       options.ordered = kb.the(target, UI.ns.ui('ordered')).value === '1'
       options.orientation = kb.the(target, UI.ns.ui('orientation')).value
-
+      options.onClose = function(e) {}  // Test it can make a close button is a good place
+        // todo: test both cases
       var tabs = div.appendChild(UI.tabs.tabWidget(options))
       return tabs
     }
@@ -60,7 +61,7 @@ document.addEventListener('DOMContentLoaded', function () {
 
     var tabContentCache = []
 
-    options.showMain = function (container, subject) {
+    options.renderMain = function (container, subject) {
       container.innerHTML = ''
       if (tabContentCache[subject.uri]) {
         container.appendChild(tabContentCache[subject.uri])