diff --git a/boltons/tableutils.py b/boltons/tableutils.py
index 4811a8e..12b6a62 100644
--- a/boltons/tableutils.py
+++ b/boltons/tableutils.py
@@ -29,6 +29,7 @@ try:
     string_types, integer_types = (str, unicode), (int, long)
 except:
     # Python 3 compat
+    unicode = str
     string_types, integer_types = (str, bytes), (int,)
 
 try:
@@ -243,6 +244,7 @@ class Table(object):
         self.headers = headers or []
         self._data = []
         self._width = 0
+
         self.extend(data)
 
     def extend(self, data):
@@ -498,7 +500,7 @@ class Table(object):
         # TODO: verify this works for markdown
         lines = []
         widths = []
-        headers = self.headers
+        headers = list(self.headers)
         text_data = [[to_text(cell, maxlen=maxlen) for cell in row]
                      for row in self._data]
         for idx in range(self._width):
@@ -514,29 +516,3 @@ class Table(object):
             lines.append(' | '.join([cell.center(widths[j])
                                      for j, cell in enumerate(row)]))
         return '\n'.join(lines)
-
-
-if __name__ == '__main__':
-    def main():
-        data_dicts = [{'id': 1, 'name': 'John Doe'},
-                      {'id': 2, 'name': 'Dale Simmons'}]
-        data_lists = [['id', 'name'],
-                      [1, 'John Doe'],
-                      [2, 'Dale Simmons']]
-        t1 = Table(data_lists)
-        t2 = Table.from_dict(data_dicts[0])
-        t3 = Table.from_dict(data_dicts)
-        t3.extend([[3, 'Kurt Rose'], [4]])
-        print(t1)
-        print(t2)
-        print(t2.to_html())
-        print(t3)
-        print(t3.to_html())
-        print(t3.to_text())
-
-        import re
-        t4 = Table.from_object(re.compile(''))
-        print(t4.to_text())
-        import pdb;pdb.set_trace()
-
-    main()
diff --git a/tests/test_tableutils.py b/tests/test_tableutils.py
new file mode 100644
index 0000000..78c8704
--- /dev/null
+++ b/tests/test_tableutils.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+from boltons.tableutils import Table
+
+
+def test_table_lists():
+    data_lists = [['id', 'name'],
+                  [1, 'John Doe'],
+                  [2, 'Dale Simmons']]
+    t1 = Table(data_lists)
+    assert set(t1.headers) == set(['id', 'name'])
+    assert len(t1) == 2
+    assert 'John Doe' in repr(t1)
+
+T2_REF_HTML = """<table>
+<tr><th>id</th><td>1</td></tr>
+<tr><th>name</th><td>John Doe</td></tr>
+</table>"""
+
+T3_REF_HTML = """<table>
+<tr><th>id</th><th>name</th></tr>
+<tr><td>1</td><td>John Doe</td></tr>
+<tr><td>2</td><td>Dale Simmons</td></tr>
+<tr><td>3</td><td>Kurt Rose</td></tr>
+<tr><td>4</td><td>None</td></tr>
+</table>"""
+
+
+def test_table_dicts():
+    data_dicts = [{'id': 1, 'name': 'John Doe'},
+                  {'id': 2, 'name': 'Dale Simmons'}]
+    t2 = Table.from_dict(data_dicts[0])
+    t3 = Table.from_dict(data_dicts)
+    t3.extend([[3, 'Kurt Rose'], [4]])
+
+    assert set(t2.headers) == set(['id', 'name'])
+    assert len(t2) == 1
+    # the sorted() stuff handles ordering differences between versions
+    # TODO: should maybe change Table to sort the headers of dicts and such?
+    assert sorted(t2.to_html()) == sorted(T2_REF_HTML)
+    assert sorted(t3.to_html()) == sorted(T3_REF_HTML)
+    assert t3.to_text()
+
+
+def test_table_obj():
+    class TestType(object):
+        def __init__(self):
+            self.greeting = 'hi'
+
+    t4 = Table.from_object(TestType())
+    assert len(t4) == 1
+    assert 'greeting' in t4.headers