diff --git a/.gitignore b/.gitignore
index 91c9479..7b0b8c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,8 @@ dist/*
 MANIFEST
 
 # python skin
-.pyc
-.pyo
+*.pyc
+*.pyo
 
 # osx noise
 .DS_Store
@@ -15,3 +15,5 @@ profile
 .idea
 .idea/*
 
+# vi noise
+*.swp
diff --git a/test_tablib.py b/test_tablib.py
index 93ff252..09d05f6 100644
--- a/test_tablib.py
+++ b/test_tablib.py
@@ -1,36 +1,55 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+"""Tests for tablib"""
+
 import unittest
 
 import tablib
 
+
 class TablibTestCase(unittest.TestCase):
+	"""Tablib test cases"""
+
 	def setUp(self):
+		"""Create simple data set with headers"""
 		global data
 		data = tablib.Dataset()
 
+		self.headers = ('first_name', 'last_name', 'gpa')
+		self.john = ('John', 'Adams', 90)
+		self.george = ('George', 'Washington', 67)
+		self.tom = ('Thomas', 'Jefferson', 50)
+
+		self.founders = tablib.Dataset(headers=self.headers)
+		self.founders.append(self.john)
+		self.founders.append(self.george)
+		self.founders.append(self.tom)
+
 	def tearDown(self):
+		"""teardown"""
 		pass
 
-	
 	def test_empty_append(self):
-		new_row = (1,2,3)
+		"""Verify append() correctly adds tuple with no headers"""
+		new_row = (1, 2, 3)
 		data.append(new_row)
 
+		# Verify width/data
 		self.assertTrue(data.width == len(new_row))
-
+		self.assertTrue(data[0] == new_row)
 
 	def test_empty_append_with_headers(self):
-
+		"""Verify append() correctly detects mismatch of number of
+		headers and data
+		"""
 		data.headers = ['first', 'second']
-		new_row = (1,2,3,4)
-		
+		new_row = (1, 2, 3, 4)
+
 		self.assertRaises(tablib.InvalidDimensions, data.append, new_row)
 
-
 	def test_add_column(self):
-		# No Headers
+		"""Verify adding column works with/without headers"""
 
 		data.append(['kenneth'])
 		data.append(['bessie'])
@@ -48,12 +67,9 @@ class TablibTestCase(unittest.TestCase):
 		data.append(col=new_col)
 
 		self.assertEquals(data[new_col[0]], new_col[1:])
-		
 
-		
 	def test_add_column_no_data_no_headers(self):
-
-		# no headers
+		"""Verify adding new column with no headers"""
 
 		new_col = ('reitz', 'monke')
 
@@ -63,10 +79,8 @@ class TablibTestCase(unittest.TestCase):
 		self.assertEquals(data.width, 1)
 		self.assertEquals(data.height, len(new_col))
 
-
 	def test_add_column_no_data_with_headers(self):
-
-		# no headers
+		"""Verify adding new column with headers"""
 
 		data.headers = ('first', 'last')
 
@@ -77,11 +91,77 @@ class TablibTestCase(unittest.TestCase):
 		self.assertEquals(data.width, 3)
 
 		new_col = ('foo', 'bar')
-		
+
 		self.assertRaises(tablib.InvalidDimensions, data.append, col=new_col)
 
 	def tuple_check(self):
-		data.append(col=(1,2,3))
-		
+		data.append(col=(1, 2, 3))
+
+	def test_header_slicing(self):
+		"""Verify slicing by headers"""
+
+		self.assertEqual(self.founders['first_name'],
+						[self.john[0], self.george[0], self.tom[0]])
+		self.assertEqual(self.founders['last_name'],
+						[self.john[1], self.george[1], self.tom[1]])
+		self.assertEqual(self.founders['gpa'],
+						[self.john[2], self.george[2], self.tom[2]])
+
+	def test_data_slicing(self):
+		"""Verify slicing by data"""
+
+		# Slice individual rows
+		self.assertEqual(self.founders[0], self.john)
+		self.assertEqual(self.founders[:1], [self.john])
+		self.assertEqual(self.founders[1:2], [self.george])
+		self.assertEqual(self.founders[-1], self.tom)
+		self.assertEqual(self.founders[3:], [])
+
+		# Slice multiple rows
+		self.assertEqual(self.founders[:], [self.john, self.george, self.tom])
+		self.assertEqual(self.founders[0:2], [self.john, self.george])
+		self.assertEqual(self.founders[1:3], [self.george, self.tom])
+		self.assertEqual(self.founders[2:], [self.tom])
+
+	def test_delete(self):
+		"""Verify deleting from dataset works"""
+
+		# Delete from front of object
+		del self.founders[0]
+		self.assertEqual(self.founders[:], [self.george, self.tom])
+
+		# Verify dimensions, width should NOT change
+		self.assertEqual(self.founders.height, 2)
+		self.assertEqual(self.founders.width, 3)
+
+		# Delete from back of object
+		del self.founders[1]
+		self.assertEqual(self.founders[:], [self.george])
+
+		# Verify dimensions, width should NOT change
+		self.assertEqual(self.founders.height, 1)
+		self.assertEqual(self.founders.width, 3)
+
+		# Delete from invalid index
+		self.assertRaises(IndexError, self.founders.__delitem__, 3)
+
+	def test_csv_export(self):
+		"""Verify exporting dataset object as CSV"""
+
+		# Build up the csv string with headers first, followed by each row
+		csv = ""
+		for col in self.headers:
+			csv += col + ","
+
+		csv = csv.strip(",") + "\r\n"
+
+		for founder in self.founders:
+			for col in founder:
+				csv += str(col) + ","
+			csv = csv.strip(",") + "\r\n"
+
+		self.assertEqual(csv, self.founders.csv)
+
+
 if __name__ == '__main__':
-	unittest.main()
\ No newline at end of file
+	unittest.main()