diff --git a/comic/models.py b/comic/models.py
index 2e64f88..a9ed5e7 100644
--- a/comic/models.py
+++ b/comic/models.py
@@ -55,7 +55,7 @@ class ComicBook(models.Model):
             self.prev_path = ''
             self.cur_index = 0
             self.cur_path = ''
-            self.q_prev_comic = False
+            self.q_prev_to_directory = False
             self.q_next_to_directory = False
 
     def nav(self, comic_path, page):
@@ -94,7 +94,7 @@ class ComicBook(models.Model):
         else:
             prev_comic = dir_list[comic_index - 1]
             comic_path = path.join(directory, prev_comic)
-            if not path.isdir(path.join(base_dir, prev_comic)):
+            if not path.isdir(path.join(base_dir, directory, prev_comic)):
                 try:
                     book = ComicBook.objects.get(file_name=prev_comic)
                 except ComicBook.DoesNotExist:
@@ -192,7 +192,7 @@ class ComicBook(models.Model):
                 df.isdir = True
                 df.icon = 'glyphicon-folder-open'
                 df.location = urlsafe_base64_encode(path.join(comic_path, fn))
-            elif fn.lower().endswith('cbz') or fn.lower().endswith('cbr'):
+            elif fn.lower()[-4:] in ['.rar', '.zip', '.cbr', '.cbz']:
                 df.iscb = True
                 df.icon = 'glyphicon-book'
                 df.location = urlsafe_base64_encode(path.join(comic_path, fn))
@@ -213,20 +213,16 @@ class ComicBook(models.Model):
                     df.label = '<span class="label label-danger pull-right">Unprocessed</span>'
             files.append(df)
         return files
-    class Comic:
-        def __init__(self):
-            self.name = ''
-            self.index = 0
 
+    @property
     def pages(self):
         out = []
         for item in ComicPage.objects.filter(Comic=self).order_by('index'):
-            i = self.Comic()
-            i.name = item.page_file_name
-            i.index = item.index
-            out.append(i)
+            out.append(item)
         return out
 
+    def page_name(self, index):
+        return ComicPage.objects.get(Comic=self, index=index).page_file_name
 
 class ComicPage(models.Model):
     Comic = models.ForeignKey(ComicBook)
diff --git a/comic/templates/comic/read_comic.html b/comic/templates/comic/read_comic.html
index d8b90b1..419a5c8 100644
--- a/comic/templates/comic/read_comic.html
+++ b/comic/templates/comic/read_comic.html
@@ -34,7 +34,7 @@
             <button type="button" data-toggle="dropdown" class="btn btn-default dropdown-toggle ">{{ orig_file_name }}<span class="caret"></span></button>
             <ul class="dropdown-menu" id="dropdown-list">
                 {% for file in book.pages %}
-                    <li><a href="/comic/read/{{ nav.cur_path }}/{{ file.index }}/">{{ file.name }}</a></li>
+                    <li><a href="/comic/read/{{ nav.cur_path }}/{{ file.index }}/">{{ file.page_file_name }}</a></li>
                 {% endfor %}
             </ul>
         </div>
diff --git a/comic/test/test1.rar b/comic/test/test1.rar
new file mode 100644
index 0000000..66d0c37
Binary files /dev/null and b/comic/test/test1.rar differ
diff --git a/comic/test/test2.rar b/comic/test/test2.rar
new file mode 100644
index 0000000..66d0c37
Binary files /dev/null and b/comic/test/test2.rar differ
diff --git a/comic/test/test3.rar b/comic/test/test3.rar
new file mode 100644
index 0000000..66d0c37
Binary files /dev/null and b/comic/test/test3.rar differ
diff --git a/comic/test/test4.rar b/comic/test/test4.rar
new file mode 100644
index 0000000..66d0c37
Binary files /dev/null and b/comic/test/test4.rar differ
diff --git a/comic/test/test_folder/blank.txt b/comic/test/test_folder/blank.txt
new file mode 100644
index 0000000..e69de29
diff --git a/comic/util.py b/comic/util.py
index a1104cf..eb0560b 100644
--- a/comic/util.py
+++ b/comic/util.py
@@ -33,18 +33,12 @@ def generate_breadcrumbs(comic_path):
     return output
 
 
-
-
 def get_ordered_dir_list(folder):
     directories = []
     files = []
-    print(folder)
     for item in os.listdir(folder):
         if path.isdir(path.join(folder, item)):
             directories.append(item)
         else:
             files.append(item)
-    print(directories)
     return sorted(directories) + sorted(files)
-
-
diff --git a/comic/views.py b/comic/views.py
index b7c3927..ecdda8b 100644
--- a/comic/views.py
+++ b/comic/views.py
@@ -62,7 +62,7 @@ def read_comic(request, comic_path, page):
     book.save()
     context = RequestContext(request, {
         'book': book,
-        'orig_file_name': book.pages()[page].name,
+        'orig_file_name': book.page_name(page),
         'nav': book.nav(comic_path, page),
         'breadcrumbs': breadcrumbs,
     })
diff --git a/comic_auth/tests.py b/comic_auth/tests.py
index 7ce503c..4f3bc35 100644
--- a/comic_auth/tests.py
+++ b/comic_auth/tests.py
@@ -1,3 +1,230 @@
 from django.test import TestCase
+from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
+from comic.models import ComicBook, ComicPage, Setting
+from os import path
+import os
 
 # Create your tests here.
+
+class ComicBookTests(TestCase):
+    def setUp(self):
+        ComicBook.process_comic_book(os.getcwd(), path.join('comic', 'test', 'test1.rar'), 'test1.rar')
+        book = ComicBook.process_comic_book(os.getcwd(), path.join('comic', 'test', 'test2.rar'), 'test2.rar')
+        book.last_read_page = 2
+        book.unread = False
+        book.save()
+        ComicBook.process_comic_book(os.getcwd(), path.join('comic', 'test', 'test4.rar'), 'test4.rar')
+        Setting(name='BASE_DIR', value=os.getcwd()).save()
+
+    def test_comic_processing(self):
+        book = ComicBook.objects.get(file_name='test1.rar')
+        self.assertEqual(book.file_name, 'test1.rar')
+        page0 = ComicPage.objects.get(Comic=book, index=0)
+        self.assertEqual(page0.page_file_name, 'img1.jpg')
+        self.assertEqual(page0.content_type, 'image/jpeg')
+        page1 = ComicPage.objects.get(Comic=book, index=1)
+        self.assertEqual(page1.page_file_name, 'img2.png')
+        self.assertEqual(page1.content_type, 'image/png')
+        page2 = ComicPage.objects.get(Comic=book, index=2)
+        self.assertEqual(page2.page_file_name, 'img3.gif')
+        self.assertEqual(page2.content_type, 'image/gif')
+        page3 = ComicPage.objects.get(Comic=book, index=3)
+        self.assertEqual(page3.page_file_name, 'img4.bmp')
+        self.assertEqual(page3.content_type, 'image/bmp')
+        self.assertEqual(ComicPage.objects.filter(Comic=book).count(), 4)
+
+    def test_page_count(self):
+        book = ComicBook.objects.get(file_name='test1.rar')
+        self.assertEqual(book.page_count, 4)
+
+    def test_is_last_page(self):
+        book = ComicBook.objects.get(file_name='test1.rar')
+        self.assertEqual(book.is_last_page(3), True)
+        self.assertEqual(book.is_last_page(2), False)
+
+    def test_get_image(self):
+        book = ComicBook.objects.get(file_name='test1.rar')
+        comic_path = path.join(os.getcwd(), 'comic', 'test', 'test1.rar')
+        img, content_type = book.get_image(comic_path, 0)
+        self.assertEqual(content_type, 'image/jpeg')
+        self.assertEqual(img.read(), 'img1.jpg')
+
+    def test_nav_first_page_with_folder_above(self):
+        book = ComicBook.objects.get(file_name='test1.rar')
+        comic_path = path.join('comic', 'test', 'test1.rar')
+        encoded_path = urlsafe_base64_encode(comic_path)
+        prev_path_encoded = urlsafe_base64_encode(path.join('comic','test'))
+        nav = book.nav(encoded_path, 0)
+        self.assertEqual(nav.next_index, 1)
+        self.assertEqual(nav.next_path, encoded_path)
+        self.assertEqual(nav.prev_index, -1)
+        self.assertEqual(nav.prev_path, prev_path_encoded)
+        self.assertEqual(nav.cur_index, 0)
+        self.assertEqual(nav.cur_path, encoded_path)
+        self.assertEqual(nav.q_prev_to_directory, True)
+        self.assertEqual(nav.q_next_to_directory, False)
+
+    def test_nav_first_page_with_comic_above(self):
+        book = ComicBook.objects.get(file_name='test2.rar')
+        comic_path = path.join('comic', 'test', 'test2.rar')
+        encoded_path = urlsafe_base64_encode(comic_path)
+        prev_path_encoded = urlsafe_base64_encode(path.join('comic', 'test', 'test1.rar'))
+        nav = book.nav(encoded_path, 0)
+        self.assertEqual(nav.next_index, 1)
+        self.assertEqual(nav.next_path, encoded_path)
+        self.assertEqual(nav.prev_index, 3)
+        self.assertEqual(nav.prev_path, prev_path_encoded)
+        self.assertEqual(nav.cur_index, 0)
+        self.assertEqual(nav.cur_path, encoded_path)
+        self.assertEqual(nav.q_prev_to_directory, False)
+        self.assertEqual(nav.q_next_to_directory, False)
+
+    def test_nav_last_page_with_comic_below(self):
+        book = ComicBook.objects.get(file_name='test2.rar')
+        comic_path = path.join('comic', 'test', 'test2.rar')
+        encoded_path = urlsafe_base64_encode(comic_path)
+        next_path_encoded = urlsafe_base64_encode(path.join('comic', 'test', 'test3.rar'))
+        nav = book.nav(encoded_path, 3)
+        self.assertEqual(nav.next_index, 0)
+        self.assertEqual(nav.next_path, next_path_encoded)
+        self.assertEqual(nav.prev_index, 2)
+        self.assertEqual(nav.prev_path, encoded_path)
+        self.assertEqual(nav.cur_index, 3)
+        self.assertEqual(nav.cur_path, encoded_path)
+        self.assertEqual(nav.q_prev_to_directory, False)
+        self.assertEqual(nav.q_next_to_directory, False)
+
+    def test_nav_last_page_with_nothing_below(self):
+        book = ComicBook.objects.get(file_name='test4.rar')
+        comic_path = path.join('comic', 'test', 'test4.rar')
+        encoded_path = urlsafe_base64_encode(comic_path)
+        next_path_encoded = urlsafe_base64_encode(path.join('comic', 'test'))
+        nav = book.nav(encoded_path, 3)
+        self.assertEqual(nav.next_index, -1)
+        self.assertEqual(nav.next_path, next_path_encoded)
+        self.assertEqual(nav.prev_index, 2)
+        self.assertEqual(nav.prev_path, encoded_path)
+        self.assertEqual(nav.cur_index, 3)
+        self.assertEqual(nav.cur_path, encoded_path)
+        self.assertEqual(nav.q_prev_to_directory, False)
+        self.assertEqual(nav.q_next_to_directory, True)
+
+    def test_nav_in_comic(self):
+        book = ComicBook.objects.get(file_name='test1.rar')
+        comic_path = path.join('comic', 'test', 'test1.rar')
+        encoded_path = urlsafe_base64_encode(comic_path)
+        nav = book.nav(encoded_path, 1)
+        self.assertEqual(nav.next_index, 2)
+        self.assertEqual(nav.next_path, encoded_path)
+        self.assertEqual(nav.prev_index, 0)
+        self.assertEqual(nav.prev_path, encoded_path)
+        self.assertEqual(nav.cur_index, 1)
+        self.assertEqual(nav.cur_path, encoded_path)
+        self.assertEqual(nav.q_prev_to_directory, False)
+        self.assertEqual(nav.q_next_to_directory, False)
+
+    def test_generate_directory(self):
+        #self.name = ''
+        #self.isdir = False
+        #self.icon = ''
+        #self.iscb = False
+        #self.location = ''
+        #self.label = ''
+        #self.cur_page = 0
+        base_dir = Setting.objects.get(name='BASE_DIR').value
+
+        folders = ComicBook.generate_directory(base_dir, path.join('comic', 'test'))
+        #should be 4 items in list.
+        dir1 = folders[0]
+        self.assertEqual(dir1.name, 'test_folder')
+        self.assertTrue(dir1.isdir)
+        self.assertEqual(dir1.icon, 'glyphicon-folder-open')
+        self.assertFalse(dir1.iscb)
+        location = urlsafe_base64_encode(path.join('comic', 'test', 'test_folder'))
+        self.assertEqual(dir1.location, location)
+        self.assertEqual(dir1.label, '')
+        self.assertEqual(dir1.cur_page, 0)
+
+        dir2 = folders[1]
+        self.assertEqual(dir2.name, 'test1.rar')
+        self.assertFalse(dir2.isdir)
+        self.assertEqual(dir2.icon, 'glyphicon-book')
+        self.assertTrue(dir2.iscb)
+        location = urlsafe_base64_encode(path.join('comic', 'test', 'test1.rar'))
+        self.assertEqual(dir2.location, location)
+        self.assertEqual(dir2.label, '<span class="label label-default pull-right">Unread</span>')
+        self.assertEqual(dir2.cur_page, 0)
+
+        dir3 = folders[2]
+        self.assertEqual(dir3.name, 'test2.rar')
+        self.assertFalse(dir3.isdir)
+        self.assertEqual(dir3.icon, 'glyphicon-book')
+        self.assertTrue(dir3.iscb)
+        location = urlsafe_base64_encode(path.join('comic', 'test', 'test2.rar'))
+        self.assertEqual(dir3.location, location)
+        self.assertEqual(dir3.label, '<span class="label label-primary pull-right">3/4</span>')
+        self.assertEqual(dir3.cur_page, 2)
+
+        dir3 = folders[3]
+        self.assertEqual(dir3.name, 'test3.rar')
+        self.assertFalse(dir3.isdir)
+        self.assertEqual(dir3.icon, 'glyphicon-book')
+        self.assertTrue(dir3.iscb)
+        location = urlsafe_base64_encode(path.join('comic', 'test', 'test3.rar'))
+        self.assertEqual(dir3.location, location)
+        self.assertEqual(dir3.label, '<span class="label label-danger pull-right">Unprocessed</span>')
+        self.assertEqual(dir3.cur_page, 0)
+
+    def test_pages(self):
+        book = ComicBook.objects.get(file_name='test1.rar')
+        pages = book.pages
+        self.assertEqual(pages[0].page_file_name, 'img1.jpg')
+        self.assertEqual(pages[0].index, 0)
+        self.assertEqual(pages[1].page_file_name, 'img2.png')
+        self.assertEqual(pages[1].index, 1)
+        self.assertEqual(pages[2].page_file_name, 'img3.gif')
+        self.assertEqual(pages[2].index, 2)
+        self.assertEqual(pages[3].page_file_name, 'img4.bmp')
+        self.assertEqual(pages[3].index, 3)
+
+    def test_page_name(self):
+        book = ComicBook.objects.get(file_name='test1.rar')
+        self.assertEqual(book.page_name(0), 'img1.jpg')
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+