diff --git a/tests/fixtures.py b/tests/fixtures.py
index b853288..73bdac0 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -8,40 +8,20 @@ import str_fixtures
 
 coder = endecoder.EnDecoder()
 
-franny_bib = """
-@article{
-    Franny1961,
+franny_bib = """@article{Franny1961,
     author = "Salinger, J. D.",
     title = "Franny and Zooey",
-    year = "1961",
-}
-
+    year = "1961"}
 """
 
 doe_bib = """
-@article{
-    Doe2013,
+@article{Doe2013,
     author = "Doe, John",
     title = "Nice Title",
-    year = "2013",
-}
-
+    year = "2013"}
 """
 
-
 franny_bibdata = coder.decode_bibdata(franny_bib)
 doe_bibdata    = coder.decode_bibdata(doe_bib)
-
-
-# bibdata = coder.decode_bibdata(str_fixtures.bibtex_external0, fmt='bibtex')
-# page99 = Paper(bibdata)
-
-
-
-
-# turing1950 = Paper()
-# turing1950.bibentry.fields['title'] = u'Computing machinery and intelligence.'
-# turing1950.bibentry.fields['year'] = u'1950'
-# turing1950.bibentry.persons['author'] = [Person(u'Alan Turing')]
-# turing1950.citekey = turing1950.generate_citekey()
-# turing1950.tags = ['computer', 'AI']
+page_bibdata   = coder.decode_bibdata(str_fixtures.bibtex_raw0)
+turing_bibdata = coder.decode_bibdata(str_fixtures.turing_bib)
diff --git a/tests/str_fixtures.py b/tests/str_fixtures.py
index ba8f32a..b29bb7f 100644
--- a/tests/str_fixtures.py
+++ b/tests/str_fixtures.py
@@ -98,7 +98,20 @@ bibtex_raw0 = """@techreport{
 
 """
 
-metadata_raw0 = """external-document: null
-notes: []
+metadata_raw0 = """docfile: null
 tags: [search, network]
-"""
\ No newline at end of file
+added: '2013-11-14 13:14:20'
+"""
+
+turing_bib = """@article{turing1950computing,
+  title={Computing machinery and intelligence},
+  author={Turing, Alan M},
+  journal={Mind},
+  volume={59},
+  number={236},
+  pages={433--460},
+  year={1950},
+  publisher={JSTOR}
+}
+
+"""
diff --git a/tests/test_bibstruct.py b/tests/test_bibstruct.py
index ab16fbd..eb1bfb1 100644
--- a/tests/test_bibstruct.py
+++ b/tests/test_bibstruct.py
@@ -13,6 +13,10 @@ import fixtures
 
 class TestGenerateCitekey(unittest.TestCase):
 
+    def test_fails_on_empty_paper(self):
+        with self.assertRaises(ValueError):
+            bibstruct.generate_citekey(None)
+
     def test_escapes_chars(self):
         doe_bibdata = copy.deepcopy(fixtures.doe_bibdata)
         citekey, entry = bibstruct.get_entry(doe_bibdata)
diff --git a/tests/test_paper.py b/tests/test_paper.py
index 03fa010..87cc8eb 100644
--- a/tests/test_paper.py
+++ b/tests/test_paper.py
@@ -36,21 +36,6 @@ class TestCreateCitekey(unittest.TestCase):
         with self.assertRaises(ValueError):
             paper.generate_citekey()
 
-    def test_escapes_chars(self):
-        paper = Paper()
-        paper.bibentry.persons['author'] = [
-                Person(last=u'Z ôu\\@/', first='Zde'),
-                Person(string='John Doe')]
-        key = paper.generate_citekey()
-        self.assertEqual(key, 'Zou')
-
-    def test_simple(self):
-        paper = Paper()
-        paper.bibentry.persons['author'] = [Person(string='John Doe')]
-        paper.bibentry.fields['year'] = '2001'
-        key = paper.generate_citekey()
-        self.assertEqual(key, 'Doe2001')
-
 
 class TestSaveLoad(unittest.TestCase):