diff --git a/test/ttest_content/__init__.py b/test/test_content/__init__.py
similarity index 100%
rename from test/ttest_content/__init__.py
rename to test/test_content/__init__.py
diff --git a/test/ttest_content/cwd.control b/test/test_content/cwd.control
similarity index 100%
rename from test/ttest_content/cwd.control
rename to test/test_content/cwd.control
diff --git a/test/ttest_content/cwd.source b/test/test_content/cwd.source
similarity index 100%
rename from test/ttest_content/cwd.source
rename to test/test_content/cwd.source
diff --git a/test/ttest_content/cwd_list.control b/test/test_content/cwd_list.control
similarity index 100%
rename from test/ttest_content/cwd_list.control
rename to test/test_content/cwd_list.control
diff --git a/test/ttest_content/cwd_list.source b/test/test_content/cwd_list.source
similarity index 100%
rename from test/ttest_content/cwd_list.source
rename to test/test_content/cwd_list.source
diff --git a/test/ttest_content/datadir/custom_list.json b/test/test_content/datadir/custom_list.json
similarity index 100%
rename from test/ttest_content/datadir/custom_list.json
rename to test/test_content/datadir/custom_list.json
diff --git a/test/ttest_content/datadir/songs/chordpro.csg b/test/test_content/datadir/songs/chordpro.csg
similarity index 100%
rename from test/ttest_content/datadir/songs/chordpro.csg
rename to test/test_content/datadir/songs/chordpro.csg
diff --git a/test/ttest_content/datadir/songs/exsong.sg b/test/test_content/datadir/songs/exsong.sg
similarity index 100%
rename from test/ttest_content/datadir/songs/exsong.sg
rename to test/test_content/datadir/songs/exsong.sg
diff --git a/test/ttest_content/datadir/songs/intersong.is b/test/test_content/datadir/songs/intersong.is
similarity index 100%
rename from test/ttest_content/datadir/songs/intersong.is
rename to test/test_content/datadir/songs/intersong.is
diff --git a/test/ttest_content/datadir/songs/jsonlist.json b/test/test_content/datadir/songs/jsonlist.json
similarity index 100%
rename from test/ttest_content/datadir/songs/jsonlist.json
rename to test/test_content/datadir/songs/jsonlist.json
diff --git a/test/ttest_content/datadir/songs/subdir/chordpro.csg b/test/test_content/datadir/songs/subdir/chordpro.csg
similarity index 100%
rename from test/ttest_content/datadir/songs/subdir/chordpro.csg
rename to test/test_content/datadir/songs/subdir/chordpro.csg
diff --git a/test/ttest_content/datadir/songs/texfile.tex b/test/test_content/datadir/songs/texfile.tex
similarity index 100%
rename from test/ttest_content/datadir/songs/texfile.tex
rename to test/test_content/datadir/songs/texfile.tex
diff --git a/test/ttest_content/datadir/songs/texsong.tsg b/test/test_content/datadir/songs/texsong.tsg
similarity index 100%
rename from test/ttest_content/datadir/songs/texsong.tsg
rename to test/test_content/datadir/songs/texsong.tsg
diff --git a/test/ttest_content/glob.control b/test/test_content/glob.control
similarity index 100%
rename from test/ttest_content/glob.control
rename to test/test_content/glob.control
diff --git a/test/ttest_content/glob.source b/test/test_content/glob.source
similarity index 100%
rename from test/ttest_content/glob.source
rename to test/test_content/glob.source
diff --git a/test/ttest_content/include.control b/test/test_content/include.control
similarity index 100%
rename from test/ttest_content/include.control
rename to test/test_content/include.control
diff --git a/test/ttest_content/include.source b/test/test_content/include.source
similarity index 100%
rename from test/ttest_content/include.source
rename to test/test_content/include.source
diff --git a/test/ttest_content/sections.control b/test/test_content/sections.control
similarity index 100%
rename from test/ttest_content/sections.control
rename to test/test_content/sections.control
diff --git a/test/ttest_content/sections.source b/test/test_content/sections.source
similarity index 100%
rename from test/ttest_content/sections.source
rename to test/test_content/sections.source
diff --git a/test/ttest_content/sections_short.control b/test/test_content/sections_short.control
similarity index 100%
rename from test/ttest_content/sections_short.control
rename to test/test_content/sections_short.control
diff --git a/test/ttest_content/sections_short.source b/test/test_content/sections_short.source
similarity index 100%
rename from test/ttest_content/sections_short.source
rename to test/test_content/sections_short.source
diff --git a/test/ttest_content/songs.control b/test/test_content/songs.control
similarity index 100%
rename from test/ttest_content/songs.control
rename to test/test_content/songs.control
diff --git a/test/ttest_content/songs.source b/test/test_content/songs.source
similarity index 100%
rename from test/ttest_content/songs.source
rename to test/test_content/songs.source
diff --git a/test/ttest_content/songsection.control b/test/test_content/songsection.control
similarity index 100%
rename from test/ttest_content/songsection.control
rename to test/test_content/songsection.control
diff --git a/test/ttest_content/songsection.source b/test/test_content/songsection.source
similarity index 100%
rename from test/ttest_content/songsection.source
rename to test/test_content/songsection.source
diff --git a/test/ttest_content/sorted.control b/test/test_content/sorted.control
similarity index 100%
rename from test/ttest_content/sorted.control
rename to test/test_content/sorted.control
diff --git a/test/ttest_content/sorted.source b/test/test_content/sorted.source
similarity index 100%
rename from test/ttest_content/sorted.source
rename to test/test_content/sorted.source
diff --git a/test/ttest_content/test_content.py b/test/test_content/test_content.py
similarity index 99%
rename from test/ttest_content/test_content.py
rename to test/test_content/test_content.py
index 92d8ec1c..fdcca1c1 100644
--- a/test/ttest_content/test_content.py
+++ b/test/test_content/test_content.py
@@ -33,6 +33,7 @@ class FileTest(unittest.TestCase, metaclass=dynamic.DynamicTest):
 
     @classmethod
     def _iter_testmethods(cls):
+        return
         """Iterate over dynamically generated test methods"""
         for source in sorted(glob.glob(os.path.join(
                 os.path.dirname(__file__),
diff --git a/test/ttest_content/tex.control b/test/test_content/tex.control
similarity index 100%
rename from test/ttest_content/tex.control
rename to test/test_content/tex.control
diff --git a/test/ttest_content/tex.source b/test/test_content/tex.source
similarity index 100%
rename from test/ttest_content/tex.source
rename to test/test_content/tex.source