3 files changed, 5 insertions, 11 deletions
diff --git a/test/test_language_base.py b/test/test_language_base.py
index deb33317..65c253da 100644
--- a/test/test_language_base.py
+++ b/test/test_language_base.py
@@ -208,7 +208,7 @@ class TestMisc:
         assert e.freeze({})
         assert e.values({})
 
-    def test_value(self):
+    def test_prevalue(self):
         class TT(base.PreValue):
             preamble = "m"
         e = TT.expr()
@@ -226,6 +226,7 @@ class TestMisc:
 
 class TKeyValue(base.KeyValue):
     preamble = "h"
+
     def values(self, settings):
         return [
             self.key.get_generator(settings),
diff --git a/test/test_language_generators.py b/test/test_language_generators.py
index 854b8485..945560c3 100644
--- a/test/test_language_generators.py
+++ b/test/test_language_generators.py
@@ -14,13 +14,6 @@ def test_randomgenerator():
     assert g[0]
 
 
-def test_literalgenerator():
-    g = generators.LiteralGenerator("one")
-    assert repr(g)
-    assert g[:] == "one"
-    assert g[1] == "n"
-
-
 def test_filegenerator():
     with tutils.tmpdir() as t:
         path = os.path.join(t, "foo")
@@ -41,7 +34,7 @@ def test_filegenerator():
 def test_transform_generator():
     def trans(offset, data):
         return "a" * len(data)
-    g = generators.LiteralGenerator("one")
+    g = "one"
     t = generators.TransformGenerator(g, trans)
     assert len(t) == len(g)
     assert t[0] == "a"
diff --git a/test/test_language_http.py b/test/test_language_http.py
index f9d2cf24..512ad277 100644
--- a/test/test_language_http.py
+++ b/test/test_language_http.py
@@ -309,11 +309,11 @@ def test_shortcuts():
 def test_user_agent():
     e = http.ShortcutUserAgent.expr()
     v = e.parseString("ua")[0]
-    assert "Android" in str(v.values({})[2])
+    assert "Android" in v.string()
 
     e = http.ShortcutUserAgent.expr()
     v = e.parseString("u'a'")[0]
-    assert "Android" not in str(v.values({})[2])
+    assert "Android" not in v.string()
 
     v = e.parseString("u@100'")[0]
     assert len(str(v.freeze({}).value)) > 100