Rename new_test_film2 -> new_test_film.

96 files changed, 371 insertions, 371 deletions

diff --git a/test/2536_regression_test.cc b/test/2536_regression_test.cc
index 7233839ae..9f74ffd09 100644
--- a/test/2536_regression_test.cc
+++ b/test/2536_regression_test.cc
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE(crash_rendering_vf_interop_subs_test)
 	auto prefix = std::string("crash_rendering_vf_interop_subs_test");
 
 	auto video = content_factory("test/data/flat_red.png");
-	auto ov = new_test_film2(prefix + "_ov", video);
+	auto ov = new_test_film(prefix + "_ov", video);
 	ov->set_interop(true);
 
 	make_and_verify_dcp(
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE(crash_rendering_vf_interop_subs_test)
 
 	auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
 	auto subtitles = content_factory("test/data/short.srt");
-	auto vf = new_test_film2(prefix + "_vf", { ov_dcp, subtitles.front() });
+	auto vf = new_test_film(prefix + "_vf", { ov_dcp, subtitles.front() });
 	vf->set_interop(true);
 	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	ov_dcp->set_reference_video(true);
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(crash_rendering_vf_interop_subs_test)
 
 	auto vf_dcp = make_shared<DCPContent>(vf->dir(vf->dcp_name()));
 	vf_dcp->add_ov(ov->dir(ov->dcp_name()));
-	auto test = new_test_film2(prefix + "_test", { vf_dcp });
+	auto test = new_test_film(prefix + "_test", { vf_dcp });
 	vf_dcp->text[0]->set_use(true);
 
 	auto player = make_shared<Player>(test, Image::Alignment::COMPACT);
diff --git a/test/4k_test.cc b/test/4k_test.cc
index 1186d7527..a1b9477b1 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -45,7 +45,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
 	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("4k_test", { c });
+	auto film = new_test_film("4k_test", { c });
 	LogSwitcher ls (film->log());
 	film->set_resolution (Resolution::FOUR_K);
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("FTR"));
diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index d070fa710..ef7449f20 100644
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
 {
 	Cleanup cl;
 
-	auto film = new_test_film2 (
+	auto film = new_test_film(
 		"atmos_passthrough_test",
 		content_factory(TestPaths::private_data() / "atmos_asset.mxf"),
 		&cl
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
 
 	auto ref = TestPaths::private_data() / "atmos_asset.mxf";
 	auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
-	auto film = new_test_film2 ("atmos_encrypted_passthrough_test", content, &cl);
+	auto film = new_test_film("atmos_encrypted_passthrough_test", content, &cl);
 
 	film->set_encrypted (true);
 	film->_key = dcp::Key ("4fac12927eb122af1c2781aa91f3a4cc");
@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
 
 	auto content2 = make_shared<DCPContent>(film->dir(film->dcp_name()));
 	content2->add_kdm (kdm);
-	auto film2 = new_test_film2 ("atmos_encrypted_passthrough_test2", {content2}, &cl);
+	auto film2 = new_test_film("atmos_encrypted_passthrough_test2", {content2}, &cl);
 	make_and_verify_dcp (film2, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
 
 	BOOST_CHECK (mxf_atmos_files_same(ref, dcp_file(film2, "atmos"), true));
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (atmos_trim_test)
 
 	auto ref = TestPaths::private_data() / "atmos_asset.mxf";
 	auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
-	auto film = new_test_film2 ("atmos_trim_test", content, &cl);
+	auto film = new_test_film("atmos_trim_test", content, &cl);
 
 	content[0]->set_trim_start(film, dcpomatic::ContentTime::from_seconds(1));
 
@@ -131,14 +131,14 @@ BOOST_AUTO_TEST_CASE(atmos_replace_test)
 	};
 
 	auto atmos_0 = content_factory("test/data/atmos_0.mxf");
-	auto ov = new_test_film2("atmos_merge_test_ov", atmos_0);
+	auto ov = new_test_film("atmos_merge_test_ov", atmos_0);
 	make_and_verify_dcp(ov, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
 	// atmos_0.mxf should contain all zeros for its data
 	check(ov, 0);
 
 	auto atmos_1 = content_factory("test/data/atmos_1.mxf");
 	auto ov_content = std::make_shared<DCPContent>(boost::filesystem::path("build/test/atmos_merge_test_ov") / ov->dcp_name());
-	auto vf = new_test_film2("atmos_merge_test_vf", { ov_content, atmos_1.front() });
+	auto vf = new_test_film("atmos_merge_test_vf", { ov_content, atmos_1.front() });
 	ov_content->set_reference_video(true);
 	atmos_1.front()->set_position(vf, dcpomatic::DCPTime());
 	make_and_verify_dcp(vf, { dcp::VerificationNote::Code::MISSING_CPL_METADATA, dcp::VerificationNote::Code::EXTERNAL_ASSET }, false);
diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 5e8bd0e2d..77b251918 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
 BOOST_AUTO_TEST_CASE (audio_analysis_test)
 {
 	auto c = make_shared<FFmpegContent>(TestPaths::private_data() / "betty_L.wav");
-	auto film = new_test_film2("audio_analysis_test", { c });
+	auto film = new_test_film("audio_analysis_test", { c });
 
 	auto job = make_shared<AnalyseAudioJob>(film, film->playlist(), false);
 	JobManager::instance()->add (job);
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
 BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 {
 	auto c = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
-	auto film = new_test_film2("audio_analysis_negative_delay_test", { c });
+	auto film = new_test_film("audio_analysis_negative_delay_test", { c });
 	c->audio->set_delay (-250);
 
 	auto job = make_shared<AnalyseAudioJob>(film, film->playlist(), false);
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_negative_delay_test)
 BOOST_AUTO_TEST_CASE (audio_analysis_test2)
 {
 	auto c = make_shared<FFmpegContent>(TestPaths::private_data() / "3d_thx_broadway_2010_lossless.m2ts");
-	auto film = new_test_film2("audio_analysis_test2", { c });
+	auto film = new_test_film("audio_analysis_test2", { c });
 
 	auto job = make_shared<AnalyseAudioJob>(film, film->playlist(), false);
 	JobManager::instance()->add (job);
@@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test2)
 BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 {
 	auto content = make_shared<FFmpegContent>("test/data/white.wav");
-	auto film = new_test_film2("analyse_audio_test", { content });
+	auto film = new_test_film("analyse_audio_test", { content });
 	film->set_audio_channels (12);
 
 	boost::signals2::connection connection;
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test3)
 BOOST_AUTO_TEST_CASE (analyse_audio_test4)
 {
 	auto content = content_factory(TestPaths::private_data() / "20 The Wedding Convoy Song.m4a")[0];
-	auto film = new_test_film2("analyse_audio_test", { content });
+	auto film = new_test_film("analyse_audio_test", { content });
 
 	auto playlist = make_shared<Playlist>();
 	playlist->add (film, content);
@@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_test4)
 
 BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test)
 {
-	auto film = new_test_film2 ("analyse_audio_leqm_test");
+	auto film = new_test_film("analyse_audio_leqm_test");
 	film->set_audio_channels (2);
 	auto content = content_factory(TestPaths::private_data() / "betty_stereo_48k.wav")[0];
 	film->examine_and_add_content (content);
@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE (analyse_audio_leqm_test)
 BOOST_AUTO_TEST_CASE(analyse_audio_leqm_same_with_empty_channels)
 {
 	auto dcp = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV");
-	auto film = new_test_film2("analyse_audio_leqm_test2", { dcp });
+	auto film = new_test_film("analyse_audio_leqm_test2", { dcp });
 	film->set_audio_channels(8);
 
 	auto analyse = [film, dcp](int channels) {
@@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE(analyse_audio_leqm_same_with_empty_channels)
 BOOST_AUTO_TEST_CASE(analyse_audio_with_long_silent_end)
 {
 	auto content = content_factory(TestPaths::private_data() / "2364.mkv")[0];
-	auto film = new_test_film2("analyse_audio_with_long_silent_end", { content });
+	auto film = new_test_film("analyse_audio_with_long_silent_end", { content });
 
 	auto playlist = make_shared<Playlist>();
 	playlist->add(film, content);
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE(analyse_audio_with_long_silent_end)
 BOOST_AUTO_TEST_CASE(analyse_audio_with_strange_channel_count)
 {
 	auto content = content_factory(TestPaths::private_data() / "mali.mkv")[0];
-	auto film = new_test_film2("analyse_audio_with_strange_channel_count", { content });
+	auto film = new_test_film("analyse_audio_with_strange_channel_count", { content });
 
 	auto playlist = make_shared<Playlist>();
 	playlist->add(film, content);
@@ -243,14 +243,14 @@ BOOST_AUTO_TEST_CASE(analyse_audio_with_strange_channel_count)
 BOOST_AUTO_TEST_CASE(analyse_audio_with_more_channels_than_film)
 {
 	auto picture = content_factory("test/data/flat_red.png");
-	auto film_16ch = new_test_film2("analyse_audio_with_more_channels_than_film_16ch", picture);
+	auto film_16ch = new_test_film("analyse_audio_with_more_channels_than_film_16ch", picture);
 	film_16ch->set_audio_channels(16);
 	make_and_verify_dcp(film_16ch);
 
 	auto pcm_16ch = find_file(film_16ch->dir(film_16ch->dcp_name()), "pcm_");
 	auto sound = content_factory(pcm_16ch)[0];
 
-	auto film_6ch = new_test_film2("analyse_audio_with_more_channels_than_film_6ch", { sound });
+	auto film_6ch = new_test_film("analyse_audio_with_more_channels_than_film_6ch", { sound });
 
 	auto playlist = make_shared<Playlist>();
 	playlist->add(film_6ch, sound);
@@ -263,7 +263,7 @@ BOOST_AUTO_TEST_CASE(analyse_audio_with_more_channels_than_film)
 BOOST_AUTO_TEST_CASE(analyse_audio_uses_processor_when_analysing_whole_film)
 {
 	auto sound = content_factory(TestPaths::private_data() / "betty_stereo.wav")[0];
-	auto film = new_test_film2("analyse_audio_uses_processor_when_analysing_whole_film", { sound });
+	auto film = new_test_film("analyse_audio_uses_processor_when_analysing_whole_film", { sound });
 
 	auto job = make_shared<AnalyseAudioJob>(film, film->playlist(), true);
 	JobManager::instance()->add(job);
diff --git a/test/audio_content_test.cc b/test/audio_content_test.cc
index f2c095fab..72023a66f 100644
--- a/test/audio_content_test.cc
+++ b/test/audio_content_test.cc
@@ -30,7 +30,7 @@
 BOOST_AUTO_TEST_CASE (audio_content_fade_empty_region)
 {
 	auto content = content_factory("test/data/impulse_train.wav");
-	auto film = new_test_film2("audio_content_fade_empty_region", content);
+	auto film = new_test_film("audio_content_fade_empty_region", content);
 
 	BOOST_CHECK(content[0]->audio->fade(content[0]->audio->stream(), 0, 0, 48000).empty());
 }
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_empty_region)
 BOOST_AUTO_TEST_CASE (audio_content_fade_no_fade)
 {
 	auto content = content_factory("test/data/impulse_train.wav");
-	auto film = new_test_film2("audio_content_fade_no_fade", content);
+	auto film = new_test_film("audio_content_fade_no_fade", content);
 
 	auto const stream = content[0]->audio->stream();
 
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_no_fade)
 BOOST_AUTO_TEST_CASE (audio_content_fade_unfaded_part)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_fade_unfaded_part", { content });
+	auto film = new_test_film("audio_content_fade_unfaded_part", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_unfaded_part)
 BOOST_AUTO_TEST_CASE (audio_content_within_the_fade_in)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_within_the_fade_in", { content });
+	auto film = new_test_film("audio_content_within_the_fade_in", { content });
 
 	content->audio->set_fade_in(dcpomatic::ContentTime::from_frames(2000, 48000));
 
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (audio_content_within_the_fade_in)
 BOOST_AUTO_TEST_CASE (audio_content_within_the_fade_out)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_within_the_fade_out", { content });
+	auto film = new_test_film("audio_content_within_the_fade_out", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE (audio_content_within_the_fade_out)
 BOOST_AUTO_TEST_CASE (audio_content_overlapping_the_fade_in)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_overlapping_the_fade_in", { content });
+	auto film = new_test_film("audio_content_overlapping_the_fade_in", { content });
 
 	content->audio->set_fade_in(dcpomatic::ContentTime::from_frames(2000, 48000));
 	content->audio->set_fade_out(dcpomatic::ContentTime::from_frames(2000, 48000));
@@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE (audio_content_overlapping_the_fade_in)
 BOOST_AUTO_TEST_CASE (audio_content_overlapping_the_fade_out)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_overlapping_the_fade_out", { content });
+	auto film = new_test_film("audio_content_overlapping_the_fade_out", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (audio_content_overlapping_the_fade_out)
 BOOST_AUTO_TEST_CASE (audio_content_fade_in_and_out)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_fade_in_and_out", { content });
+	auto film = new_test_film("audio_content_fade_in_and_out", { content });
 
 	auto const stream = content->audio->stream();
 	auto const length = stream->length();
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_in_and_out)
 BOOST_AUTO_TEST_CASE (audio_content_fade_in_with_trim)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_fade_in_with_trim", { content });
+	auto film = new_test_film("audio_content_fade_in_with_trim", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_in_with_trim)
 BOOST_AUTO_TEST_CASE (audio_content_fade_out_with_trim)
 {
 	auto content = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("audio_content_fade_out_with_trim", { content });
+	auto film = new_test_film("audio_content_fade_out_with_trim", { content });
 
 	auto const stream = content->audio->stream();
 	auto const length = stream->length();
@@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_out_with_trim_at_44k1)
 {
 	/* 5s at 44.1kHz */
 	auto content = content_factory("test/data/white.wav")[0];
-	auto film = new_test_film2("audio_content_fade_out_with_trim_at_44k1", { content });
+	auto film = new_test_film("audio_content_fade_out_with_trim_at_44k1", { content });
 
 	auto const stream = content->audio->stream();
 
@@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_out_with_trim_at_44k1)
 BOOST_AUTO_TEST_CASE (audio_content_fades_same_as_video)
 {
 	auto content = content_factory("test/data/staircase.mov")[0];
-	auto film = new_test_film2("audio_content_fades_same_as_video", { content });
+	auto film = new_test_film("audio_content_fades_same_as_video", { content });
 
 	content->audio->set_use_same_fades_as_video(true);
 	content->video->set_fade_in(9);
diff --git a/test/audio_delay_test.cc b/test/audio_delay_test.cc
index bafdea4e1..369881d71 100644
--- a/test/audio_delay_test.cc
+++ b/test/audio_delay_test.cc
@@ -56,7 +56,7 @@ void test_audio_delay (int delay_in_ms)
 {
 	string const film_name = "audio_delay_test_" + lexical_cast<string> (delay_in_ms);
 	auto content = make_shared<FFmpegContent>("test/data/staircase.wav");
-	auto film = new_test_film2 (film_name, { content });
+	auto film = new_test_film(film_name, { content });
 
 	content->audio->set_delay (delay_in_ms);
 
diff --git a/test/audio_processor_test.cc b/test/audio_processor_test.cc
index 15e71e1c4..8ec829bf1 100644
--- a/test/audio_processor_test.cc
+++ b/test/audio_processor_test.cc
@@ -42,7 +42,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE (audio_processor_test)
 {
 	auto c = make_shared<FFmpegContent>("test/data/white.wav");
-	auto film = new_test_film2("audio_processor_test", { c });
+	auto film = new_test_film("audio_processor_test", { c });
 
 	film->set_audio_channels(16);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 089b2e9ec..c3c253d51 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -59,7 +59,7 @@ using namespace dcpomatic;
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 {
 	auto content = content_factory("test/data/subrip2.srt")[0];
-	auto film = new_test_film2("burnt_subtitle_test_subrip", { content });
+	auto film = new_test_film("burnt_subtitle_test_subrip", { content });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	content->text[0]->set_use(true);
 	content->text[0]->set_burn(true);
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 {
 	auto content = content_factory("test/data/dcp_sub.xml")[0];
-	auto film = new_test_film2("burnt_subtitle_test_dcp", { content });
+	auto film = new_test_film("burnt_subtitle_test_dcp", { content });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film->set_name("frobozz");
 	content->text[0]->set_use(true);
@@ -97,14 +97,14 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 /** Burn some subtitles into an existing DCP to check the colour conversion */
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 {
-	auto film = new_test_film2("burnt_subtitle_test_onto_dcp", { content_factory("test/data/flat_black.png")[0] });
+	auto film = new_test_film("burnt_subtitle_test_onto_dcp", { content_factory("test/data/flat_black.png")[0] });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	make_and_verify_dcp (film);
 
 	Config::instance()->set_log_types (Config::instance()->log_types() | LogEntry::TYPE_DEBUG_ENCODE);
 	auto background_dcp = make_shared<DCPContent>(film->dir(film->dcp_name()));
 	auto sub = content_factory("test/data/subrip2.srt")[0];
-	auto film2 = new_test_film2("burnt_subtitle_test_onto_dcp2", { background_dcp, sub });
+	auto film2 = new_test_film("burnt_subtitle_test_onto_dcp2", { background_dcp, sub });
 	film2->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film2->set_name("frobozz");
 	sub->text[0]->set_burn(true);
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(burnt_subtitle_test_position)
 	{
 		auto const name = String::compose("burnt_subtitle_test_position_%1", alignment);
 		auto subs = content_factory(String::compose("test/data/burn_%1.xml", alignment));
-		auto film = new_test_film2(name, subs);
+		auto film = new_test_film(name, subs);
 		subs[0]->text[0]->set_use(true);
 		subs[0]->text[0]->set_burn(true);
 		make_and_verify_dcp(
@@ -178,7 +178,7 @@ BOOST_AUTO_TEST_CASE(burn_empty_subtitle_test)
 	Cleanup cl;
 
 	auto content = content_factory("test/data/empty_sub.xml")[0];
-	auto film = new_test_film2("burnt_empty_subtitle_test", { content });
+	auto film = new_test_film("burnt_empty_subtitle_test", { content });
 	content->text[0]->set_use(true);
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
diff --git a/test/butler_test.cc b/test/butler_test.cc
index b0d4590da..f7c307e3c 100644
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE (butler_test1)
 {
 	auto video = content_factory("test/data/flat_red.png")[0];
 	auto audio = content_factory("test/data/staircase.wav")[0];
-	auto film = new_test_film2("butler_test1", { video, audio });
+	auto film = new_test_film("butler_test1", { video, audio });
 	film->set_audio_channels (6);
 
 	/* This is the map of the player output (5.1) to the butler output (also 5.1) */
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (butler_test2)
 {
 	auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv");
 	BOOST_REQUIRE (!content.empty());
-	auto film = new_test_film2 ("butler_test2", { content.front() });
+	auto film = new_test_film("butler_test2", { content.front() });
 	BOOST_REQUIRE (content.front()->audio);
 	content.front()->audio->set_delay(100);
 
diff --git a/test/bv20_test.cc b/test/bv20_test.cc
index 7f4e98aa7..d41868601 100644
--- a/test/bv20_test.cc
+++ b/test/bv20_test.cc
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE(bv21_extensions_used_when_not_limited)
 {
 	auto picture = content_factory("test/data/flat_red.png");
 	auto sound = content_factory("test/data/sine_440.wav");
-	auto film = new_test_film2("bv21_extensions_used_when_not_limited", { picture.front(), sound.front() });
+	auto film = new_test_film("bv21_extensions_used_when_not_limited", { picture.front(), sound.front() });
 
 	make_and_verify_dcp(film);
 
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(bv21_extensions_not_used_when_limited)
 {
 	auto picture = content_factory("test/data/flat_red.png");
 	auto sound = content_factory("test/data/sine_440.wav");
-	auto film = new_test_film2("bv21_extensions_not_used_when_limited", { picture.front(), sound.front () });
+	auto film = new_test_film("bv21_extensions_not_used_when_limited", { picture.front(), sound.front () });
 	film->set_limit_to_smpte_bv20(true);
 
 	make_and_verify_dcp(film);
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 8acad2306..9840a07a1 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(real_encode_with_server)
 	Cleanup cl;
 
 	auto content = content_factory(TestPaths::private_data() / "dolby_aurora.vob");
-	auto film = new_test_film2("real_encode_with_server", content, &cl);
+	auto film = new_test_film("real_encode_with_server", content, &cl);
 
 	EncodeServerFinder::instance();
 
diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 313e2a8d3..1a9531f4a 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (closed_caption_test1)
 	Cleanup cl;
 
 	auto content = make_shared<StringTextFileContent>("test/data/subrip.srt");
-	auto film = new_test_film2 ("closed_caption_test1", { content }, &cl);
+	auto film = new_test_film("closed_caption_test1", { content }, &cl);
 
 	content->only_text()->set_type (TextType::CLOSED_CAPTION);
 
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
 	auto content1 = make_shared<StringTextFileContent>("test/data/subrip.srt");
 	auto content2 = make_shared<StringTextFileContent>("test/data/subrip2.srt");
 	auto content3 = make_shared<StringTextFileContent>("test/data/subrip3.srt");
-	auto film = new_test_film2 ("closed_caption_test2", { content1, content2, content3 }, &cl);
+	auto film = new_test_film("closed_caption_test2", { content1, content2, content3 }, &cl);
 
 	content1->only_text()->set_type (TextType::CLOSED_CAPTION);
 	content1->only_text()->set_dcp_track (DCPTextTrack("First track", dcp::LanguageTag("fr-FR")));
diff --git a/test/content_test.cc b/test/content_test.cc
index 3df2df470..06d186da6 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -42,7 +42,7 @@ using namespace dcpomatic;
 BOOST_AUTO_TEST_CASE (content_test1)
 {
 	auto content = content_factory(TestPaths::private_data() / "demo_sound_bug.mkv")[0];
-	auto film = new_test_film2("content_test1", { content });
+	auto film = new_test_film("content_test1", { content });
 	film->set_audio_channels(16);
 	make_and_verify_dcp (
 		film,
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE (content_test1)
 BOOST_AUTO_TEST_CASE (content_test2)
 {
 	auto content = content_factory("test/data/red_23976.mp4")[0];
-	auto film = new_test_film2 ("content_test2", {content});
+	auto film = new_test_film("content_test2", {content});
 	content->set_trim_start(film, ContentTime::from_seconds(0.5));
 	make_and_verify_dcp (film);
 }
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE (content_test2)
 BOOST_AUTO_TEST_CASE (content_test3)
 {
 	auto content = content_factory("test/data/red_24.mp4")[0];
-	auto film = new_test_film2 ("content_test3", {content});
+	auto film = new_test_film("content_test3", {content});
 	film->set_sequence (false);
 
 	/* Trim */
@@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE (content_test3)
 /** Content containing video will have its length rounded to the nearest video frame */
 BOOST_AUTO_TEST_CASE (content_test4)
 {
-	auto film = new_test_film2 ("content_test4");
+	auto film = new_test_film("content_test4");
 
 	auto video = content_factory("test/data/count300bd24.m2ts")[0];
 	film->examine_and_add_content (video);
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE (content_test4)
 BOOST_AUTO_TEST_CASE (content_test5)
 {
 	auto audio = content_factory("test/data/sine_16_48_220_10.wav");
-	auto film = new_test_film2 ("content_test5", audio);
+	auto film = new_test_film("content_test5", audio);
 
 	audio[0]->set_trim_end(dcpomatic::ContentTime(3000));
 
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE (content_test6)
 {
 	Cleanup cl;
 
-	auto film = new_test_film2 (
+	auto film = new_test_film(
 		"content_test6",
 		content_factory(TestPaths::private_data() / "fha.mkv"),
 		&cl
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (content_test7)
 	Cleanup cl;
 
 	auto content = content_factory(TestPaths::private_data() / "clapperboard.mp4");
-	auto film = new_test_film2("content_test7", content, &cl);
+	auto film = new_test_film("content_test7", content, &cl);
 	content[0]->audio->set_delay(-1000);
 	make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K });
 
@@ -174,7 +174,7 @@ BOOST_AUTO_TEST_CASE(wav_with_markers_zero_channels_test)
 	Cleanup cl;
 
 	auto content = content_factory(TestPaths::private_data() / "wav_with_markers.wav");
-	auto film = new_test_film2("wav_with_markers_zero_channels_test", content, &cl);
+	auto film = new_test_film("wav_with_markers_zero_channels_test", content, &cl);
 	make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
 
 	cl.run();
diff --git a/test/cpl_hash_test.cc b/test/cpl_hash_test.cc
index 3b430a6bd..603fa4b8d 100644
--- a/test/cpl_hash_test.cc
+++ b/test/cpl_hash_test.cc
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test)
 	using namespace boost::filesystem;
 
 	string const ov_name = "hash_added_to_imported_dcp_test_ov";
-	auto ov = new_test_film2(
+	auto ov = new_test_film(
 		ov_name,
 		content_factory("test/data/flat_red.png")
 		);
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (hash_added_to_imported_dcp_test)
 
 	string const vf_name = "hash_added_to_imported_dcp_test_vf";
 	auto ov_content = make_shared<DCPContent>(String::compose("build/test/%1/%2", ov_name, ov->dcp_name()));
-	auto vf = new_test_film2 (
+	auto vf = new_test_film(
 		vf_name, { ov_content }
 		);
 
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc
index 544e78899..59ceed064 100644
--- a/test/cpl_metadata_test.cc
+++ b/test/cpl_metadata_test.cc
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(main_sound_configuration_test_51_vi)
 	auto Rs = content_factory("test/data/Rs.wav")[0];
 	auto VI = content_factory("test/data/sine_440.wav")[0];
 
-	auto film = new_test_film2("main_sound_configuration_test_51_vi", { picture, L, R, C, Lfe, Ls, Rs, VI });
+	auto film = new_test_film("main_sound_configuration_test_51_vi", { picture, L, R, C, Lfe, Ls, Rs, VI });
 	film->set_audio_channels(8);
 
 	auto set_map = [](shared_ptr<Content> content, dcp::Channel channel) {
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE(main_sound_configuration_test_71)
 	auto BsR = content_factory("test/data/Rs.wav")[0];
 	auto VI = content_factory("test/data/sine_440.wav")[0];
 
-	auto film = new_test_film2("main_sound_configuration_test_51_vi", { picture, L, R, C, Lfe, Ls, Rs, BsL, BsR, VI });
+	auto film = new_test_film("main_sound_configuration_test_51_vi", { picture, L, R, C, Lfe, Ls, Rs, BsL, BsR, VI });
 	film->set_audio_channels(12);
 
 	auto set_map = [](shared_ptr<Content> content, dcp::Channel channel) {
diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index d0052f4a1..6e2bdcb6a 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -52,15 +52,15 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 {
 	/* Make some DCPs */
 
-	auto ov = new_test_film2 ("check_reuse_old_data_ov", content_factory("test/data/flat_red.png"));
+	auto ov = new_test_film("check_reuse_old_data_ov", content_factory("test/data/flat_red.png"));
 	make_and_verify_dcp (ov);
 
 	auto ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
-	auto vf = new_test_film2 ("check_reuse_old_data_vf", {ov_content, content_factory("test/data/L.wav")[0]});
+	auto vf = new_test_film("check_reuse_old_data_vf", {ov_content, content_factory("test/data/L.wav")[0]});
 	ov_content->set_reference_video (true);
 	make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
-	auto encrypted = new_test_film2 ("check_reuse_old_data_decrypted");
+	auto encrypted = new_test_film("check_reuse_old_data_decrypted");
 	encrypted->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
 	BOOST_REQUIRE (!wait_for_jobs());
 	encrypted->set_encrypted (true);
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	/* Add just the OV to a new project, move it around a bit and check that
 	   the _reels get reused.
 	*/
-	auto test = new_test_film2 ("check_reuse_old_data_test1");
+	auto test = new_test_film("check_reuse_old_data_test1");
 	ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
 	test->examine_and_add_content (ov_content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	/* Add the VF to a new project, then add the OV and check that the
 	   _reels did not get reused.
 	*/
-	test = new_test_film2 ("check_reuse_old_data_test2");
+	test = new_test_film("check_reuse_old_data_test2");
 	auto vf_content = make_shared<DCPContent>(vf->dir(vf->dcp_name(false)));
 	test->examine_and_add_content (vf_content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	BOOST_REQUIRE (reels != decoder->reels());
 
 	/* Add a KDM to an encrypted DCP and check that the _reels did not get reused */
-	test = new_test_film2 ("check_reuse_old_data_test3");
+	test = new_test_film("check_reuse_old_data_test3");
 	auto encrypted_content = make_shared<DCPContent>(encrypted->dir(encrypted->dcp_name(false)));
 	test->examine_and_add_content (encrypted_content);
 	BOOST_REQUIRE (!wait_for_jobs());
diff --git a/test/dcp_digest_file_test.cc b/test/dcp_digest_file_test.cc
index f22aa6d67..5c12fbb33 100644
--- a/test/dcp_digest_file_test.cc
+++ b/test/dcp_digest_file_test.cc
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (dcp_digest_file_test2)
 	};
 
 	auto red = content_factory("test/data/flat_red.png");
-	auto ov = new_test_film2 ("dcp_digest_file_test2_ov", red);
+	auto ov = new_test_film("dcp_digest_file_test2_ov", red);
 	ov->set_encrypted (true);
 	make_and_verify_dcp (ov);
 
@@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE (dcp_digest_file_test2)
 	ov_dcp->add_kdm (kdm);
 	ov_dcp->set_reference_video (true);
 	ov_dcp->set_reference_audio (true);
-	auto vf = new_test_film2 ("dcp_digest_file_test2_vf", { ov_dcp });
+	auto vf = new_test_film("dcp_digest_file_test2_vf", { ov_dcp });
 	vf->set_encrypted (true);
 	make_and_verify_dcp(vf, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
diff --git a/test/dcp_examiner_test.cc b/test/dcp_examiner_test.cc
index 7275a33c7..6efbd1bbc 100644
--- a/test/dcp_examiner_test.cc
+++ b/test/dcp_examiner_test.cc
@@ -34,13 +34,13 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE(check_examine_vfs)
 {
 	auto image = content_factory("test/data/scope_red.png")[0];
-	auto ov = new_test_film2("check_examine_vfs_ov", { image });
+	auto ov = new_test_film("check_examine_vfs_ov", { image });
 	ov->set_container(Ratio::from_id("239"));
 	make_and_verify_dcp(ov);
 
 	auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
 	auto second_reel = content_factory("test/data/scope_red.png")[0];
-	auto vf = new_test_film2("check_examine_vfs_vf", { ov_dcp, second_reel });
+	auto vf = new_test_film("check_examine_vfs_vf", { ov_dcp, second_reel });
 	vf->set_container(Ratio::from_id("239"));
 	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	ov_dcp->set_reference_video(true);
diff --git a/test/dcp_metadata_test.cc b/test/dcp_metadata_test.cc
index dd81a4161..f3d912631 100644
--- a/test/dcp_metadata_test.cc
+++ b/test/dcp_metadata_test.cc
@@ -31,7 +31,7 @@
 BOOST_AUTO_TEST_CASE (dcp_metadata_test)
 {
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2 ("dcp_metadata_test", content);
+	auto film = new_test_film("dcp_metadata_test", content);
 
 	Config::instance()->set_dcp_creator ("this is the creator");
 	Config::instance()->set_dcp_issuer ("this is the issuer");
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (dcp_metadata_test)
 BOOST_AUTO_TEST_CASE(main_picture_active_area_test)
 {
 	auto content = content_factory(TestPaths::private_data() / "bbc405.png");
-	auto film = new_test_film2("main_picture_active_area_test", content);
+	auto film = new_test_film("main_picture_active_area_test", content);
 	film->set_resolution(Resolution::FOUR_K);
 	film->set_interop(false);
 
diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 30a9e6c46..3b08f998c 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -39,7 +39,7 @@ using namespace dcpomatic;
 BOOST_AUTO_TEST_CASE (dcp_playback_test)
 {
 	auto content = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV");
-	auto film = new_test_film2("dcp_playback_test", { content });
+	auto film = new_test_film("dcp_playback_test", { content });
 
 	Player player(film, Image::Alignment::PADDED);
 
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index cd4c53ea5..f7a9450f5 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -76,7 +76,7 @@ store (ContentStringText sub)
 BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 {
 	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub.xml");
-	auto film = new_test_film2("dcp_subtitle_test", { content });
+	auto film = new_test_film("dcp_subtitle_test", { content });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film->set_name("frobozz");
 
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 {
 	auto content = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV");
-	auto film = new_test_film2("dcp_subtitle_within_dcp_test", { content });
+	auto film = new_test_film("dcp_subtitle_within_dcp_test", { content });
 
 	auto decoder = make_shared<DCPDecoder>(film, content, false, false, shared_ptr<DCPDecoder>());
 	decoder->only_text()->PlainStart.connect (bind (store, _1));
@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
 {
 	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub2.xml");
-	auto film = new_test_film2("dcp_subtitle_test2", { content });
+	auto film = new_test_film("dcp_subtitle_test2", { content });
 
 	auto decoder = make_shared<DCPSubtitleDecoder>(film, content);
 	decoder->only_text()->PlainStart.connect (bind (store, _1));
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
 BOOST_AUTO_TEST_CASE (dcp_subtitle_test3)
 {
 	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub3.xml");
-	auto film = new_test_film2("dcp_subtitle_test3", { content });
+	auto film = new_test_film("dcp_subtitle_test3", { content });
 	film->set_interop (true);
 	content->only_text()->set_language(dcp::LanguageTag("de"));
 
@@ -173,7 +173,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
 {
 	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub3.xml");
 	auto content2 = make_shared<DCPSubtitleContent>("test/data/dcp_sub3.xml");
-	auto film = new_test_film2 ("dcp_subtitle_test4", {content, content2});
+	auto film = new_test_film("dcp_subtitle_test4", {content, content2});
 	film->set_interop (true);
 
 	content->only_text()->add_font(make_shared<Font>("font1"));
@@ -208,7 +208,7 @@ check_font_tags (vector<cxml::NodePtr> nodes)
 BOOST_AUTO_TEST_CASE (dcp_subtitle_test5)
 {
 	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub6.xml");
-	auto film = new_test_film2 ("dcp_subtitle_test5", {content});
+	auto film = new_test_film("dcp_subtitle_test5", {content});
 	film->set_interop (true);
 	content->only_text()->set_language(dcp::LanguageTag("de"));
 
@@ -227,7 +227,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test5)
 BOOST_AUTO_TEST_CASE (test_font_override)
 {
 	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub4.xml");
-	auto film = new_test_film2("test_font_override", {content});
+	auto film = new_test_film("test_font_override", {content});
 	film->set_interop(true);
 	content->only_text()->set_language(dcp::LanguageTag("de"));
 
@@ -266,7 +266,7 @@ BOOST_AUTO_TEST_CASE(entity_from_dcp_source)
 	source_xml.close();
 
 	auto content = make_shared<DCPSubtitleContent>("build/test/entity_from_dcp_source.xml");
-	auto film = new_test_film2("entity_from_dcp_source", { content });
+	auto film = new_test_film("entity_from_dcp_source", { content });
 	film->set_interop(false);
 	content->only_text()->set_use(true);
 	content->only_text()->set_burn(false);
diff --git a/test/digest_test.cc b/test/digest_test.cc
index 2ad6aefd1..39737b7f5 100644
--- a/test/digest_test.cc
+++ b/test/digest_test.cc
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (digest_test)
 	auto r = make_shared<ImageContent>("test/data/flat_red.png");
 	auto g = make_shared<ImageContent>("test/data/flat_green.png");
 	auto b = make_shared<ImageContent>("test/data/flat_blue.png");
-	auto film = new_test_film2("digest_test", { r, g, b });
+	auto film = new_test_film("digest_test", { r, g, b });
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
 	BOOST_CHECK (Config::instance()->master_encoding_threads() > 1);
diff --git a/test/empty_caption_test.cc b/test/empty_caption_test.cc
index 3138c4af2..d9ae4a1c7 100644
--- a/test/empty_caption_test.cc
+++ b/test/empty_caption_test.cc
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE (check_for_no_empty_text_nodes_in_failure_case)
 	Cleanup cl;
 
 	auto content = content_factory("test/data/empty.srt");
-	auto film = new_test_film2("check_for_no_empty_text_nodes_in_failure_case", content, &cl);
+	auto film = new_test_film("check_for_no_empty_text_nodes_in_failure_case", content, &cl);
 	auto text = content[0]->text.front();
 	text->set_type (TextType::CLOSED_CAPTION);
 	text->set_dcp_track({"English", dcp::LanguageTag("en")});
diff --git a/test/empty_test.cc b/test/empty_test.cc
index b186954b3..922d6a5b1 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -55,7 +55,7 @@ has_video (shared_ptr<const Content> content)
 
 BOOST_AUTO_TEST_CASE (empty_test1)
 {
-	auto film = new_test_film2 ("empty_test1");
+	auto film = new_test_film("empty_test1");
 	film->set_sequence (false);
 	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (empty_test1)
 /** Some tests where the first empty period is not at time 0 */
 BOOST_AUTO_TEST_CASE (empty_test2)
 {
-	auto film = new_test_film2 ("empty_test2");
+	auto film = new_test_film("empty_test2");
 	film->set_sequence (false);
 	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE (empty_test2)
 /** Test for when the film's playlist is not the same as the one passed into Empty */
 BOOST_AUTO_TEST_CASE (empty_test3)
 {
-	auto film = new_test_film2 ("empty_test3");
+	auto film = new_test_film("empty_test3");
 	film->set_sequence (false);
 	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (empty_test3)
 
 BOOST_AUTO_TEST_CASE (empty_test_with_overlapping_content)
 {
-	auto film = new_test_film2 ("empty_test_with_overlapping_content");
+	auto film = new_test_film("empty_test_with_overlapping_content");
 	film->set_sequence (false);
 	auto contentA = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 9cadd087e..97359cd44 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -36,7 +36,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE (smpte_dcp_with_subtitles_can_be_decrypted)
 {
 	auto content = content_factory("test/data/15s.srt");
-	auto film = new_test_film2 ("smpte_dcp_with_subtitles_can_be_decrypted", content);
+	auto film = new_test_film("smpte_dcp_with_subtitles_can_be_decrypted", content);
 	film->set_interop (false);
 	film->set_encrypted (true);
 	make_and_verify_dcp (
diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc
index 2c8f3f54c..d994de91b 100644
--- a/test/ffmpeg_audio_only_test.cc
+++ b/test/ffmpeg_audio_only_test.cc
@@ -79,7 +79,7 @@ static shared_ptr<Film>
 test (boost::filesystem::path file)
 {
 	auto c = make_shared<FFmpegContent>(file);
-	auto film = new_test_film2("ffmpeg_audio_only_test", { c });
+	auto film = new_test_film("ffmpeg_audio_only_test", { c });
 	film->write_metadata ();
 
 	/* See if can make a DCP without any errors */
diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 09331c5af..01bc38da3 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -52,7 +52,7 @@ using std::string;
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 {
 	auto c = make_shared<FFmpegContent> ("test/data/staircase.mov");
-	auto film = new_test_film2("ffmpeg_audio_test", { c });
+	auto film = new_test_film("ffmpeg_audio_test", { c });
 
 	int constexpr audio_channels = 6;
 
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 /** Decode a file containing truehd so we can profile it; this is with the player set to normal */
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 {
-	auto film = new_test_film2 ("ffmpeg_audio_test2");
+	auto film = new_test_film("ffmpeg_audio_test2");
 	auto content = content_factory(TestPaths::private_data() / "wayne.mkv")[0];
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
@@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 /** Decode a file containing truehd so we can profile it; this is with the player set to fast */
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 {
-	auto film = new_test_film2 ("ffmpeg_audio_test3");
+	auto film = new_test_film("ffmpeg_audio_test3");
 	auto content = content_factory(TestPaths::private_data() / "wayne.mkv")[0];
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 /** Decode a file whose audio previously crashed DCP-o-matic (#1857) */
 BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4)
 {
-	auto film = new_test_film2 ("ffmpeg_audio_test4");
+	auto film = new_test_film("ffmpeg_audio_test4");
 	auto content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv")[0];
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index d7c372416..96a3618be 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -44,7 +44,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 {
 	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("ffmpeg_dcp_test", { c });
+	auto film = new_test_film("ffmpeg_dcp_test", { c });
 	film->set_name("test_film2");
 	make_and_verify_dcp (film);
 }
diff --git a/test/ffmpeg_decoder_error_test.cc b/test/ffmpeg_decoder_error_test.cc
index 1bb289feb..b53eabac5 100644
--- a/test/ffmpeg_decoder_error_test.cc
+++ b/test/ffmpeg_decoder_error_test.cc
@@ -39,7 +39,7 @@
 BOOST_AUTO_TEST_CASE (check_exception_during_flush)
 {
 	auto content = content_factory(TestPaths::private_data() / "3d_thx_broadway_2010_lossless.m2ts");
-	auto film = new_test_film2 ("check_exception_during_flush", content);
+	auto film = new_test_film("check_exception_during_flush", content);
 
 	content[0]->set_trim_start(film, dcpomatic::ContentTime(2310308));
 	content[0]->set_trim_end(dcpomatic::ContentTime(116020));
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (check_exception_during_flush)
 BOOST_AUTO_TEST_CASE (check_exception_with_multiple_video_frames_per_packet)
 {
 	auto content = content_factory(TestPaths::private_data() / "chk.mkv")[0];
-	auto film = new_test_film2 ("check_exception_with_multiple_video_frames_per_packet", { content });
+	auto film = new_test_film("check_exception_with_multiple_video_frames_per_packet", { content });
 	auto player = std::make_shared<Player>(film, film->playlist());
 
 	while (!player->pass()) {}
diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index 6fb4cc876..796db043f 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -81,7 +81,7 @@ test (boost::filesystem::path file, vector<ContentTime> times)
 	BOOST_REQUIRE (boost::filesystem::exists (path));
 
 	auto content = make_shared<FFmpegContent>(path);
-	auto film = new_test_film2("ffmpeg_decoder_seek_test_" + file.string(), { content });
+	auto film = new_test_film("ffmpeg_decoder_seek_test_" + file.string(), { content });
 	auto decoder = make_shared<FFmpegDecoder>(film, content, false);
 	decoder->video->Data.connect (bind (&store, _1));
 
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 8bcafd275..c0fe26ea3 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -71,7 +71,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	BOOST_REQUIRE (boost::filesystem::exists (path));
 
 	auto content = make_shared<FFmpegContent>(path);
-	auto film = new_test_film2("ffmpeg_decoder_sequential_test_" + file.string(), { content });
+	auto film = new_test_film("ffmpeg_decoder_sequential_test_" + file.string(), { content });
 	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
 
 	BOOST_REQUIRE (content->video_frame_rate());
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 64ce8e96b..b42ff92d8 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -76,7 +76,7 @@ ffmpeg_content_test (int number, boost::filesystem::path content, ExportFormat f
 	name = String::compose("%1_test%2", name, number);
 
 	auto c = make_shared<FFmpegContent>(content);
-	auto film = new_test_film2 (name, {c}, &cl);
+	auto film = new_test_film(name, {c}, &cl);
 	film->set_name (name);
 	film->set_audio_channels (6);
 
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 	cl.add(output);
 
 	auto c = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
-	auto film = new_test_film2("ffmpeg_encoder_prores_test5", { c });
+	auto film = new_test_film("ffmpeg_encoder_prores_test5", { c });
 	film->set_audio_channels (6);
 
 	c->video->set_length (240);
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test5)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test6)
 {
 	auto s = make_shared<StringTextFileContent>("test/data/subrip2.srt");
-	auto film = new_test_film2("ffmpeg_encoder_prores_test6", { s });
+	auto film = new_test_film("ffmpeg_encoder_prores_test6", { s });
 	film->set_audio_channels (6);
 
 	s->only_text()->set_colour (dcp::Colour (255, 255, 0));
@@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_test7)
 
 	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
 	auto s = make_shared<StringTextFileContent>("test/data/subrip.srt");
-	auto film = new_test_film2("ffmpeg_encoder_prores_test7", { c, s });
+	auto film = new_test_film("ffmpeg_encoder_prores_test7", { c, s });
 	film->set_audio_channels (6);
 
 	s->only_text()->set_colour (dcp::Colour (255, 255, 0));
@@ -194,7 +194,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test1)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test2)
 {
 	auto s = make_shared<StringTextFileContent>("test/data/subrip2.srt");
-	auto film = new_test_film2("ffmpeg_encoder_h264_test2", { s });
+	auto film = new_test_film("ffmpeg_encoder_h264_test2", { s });
 	film->set_audio_channels (6);
 
 	s->only_text()->set_colour (dcp::Colour (255, 255, 0));
@@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
 {
 	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
 	auto s = make_shared<StringTextFileContent>("test/data/subrip.srt");
-	auto film = new_test_film2("ffmpeg_encoder_h264_test3", { c, s });
+	auto film = new_test_film("ffmpeg_encoder_h264_test3", { c, s });
 	film->set_audio_channels (6);
 
 	s->only_text()->set_colour (dcp::Colour (255, 255, 0));
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test3)
 /** Scope-in-flat DCP -> H264 */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test4)
 {
-	auto film = new_test_film2("ffmpeg_encoder_h264_test4", {make_shared<DCPContent>("test/data/scope_dcp")});
+	auto film = new_test_film("ffmpeg_encoder_h264_test4", {make_shared<DCPContent>("test/data/scope_dcp")});
 	BOOST_REQUIRE(!wait_for_jobs());
 
 	film->set_container(Ratio::from_id("185"));
@@ -251,7 +251,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 	auto Rs = make_shared<FFmpegContent>("test/data/Rs.wav");
 	auto Lfe = make_shared<FFmpegContent>("test/data/Lfe.wav");
 
-	auto film = new_test_film2("ffmpeg_encoder_h264_test5", { L, R, C, Ls, Rs, Lfe });
+	auto film = new_test_film("ffmpeg_encoder_h264_test5", { L, R, C, Ls, Rs, Lfe });
 	film->set_audio_channels (6);
 
 	AudioMapping map (1, MAX_DCP_AUDIO_CHANNELS);
@@ -292,12 +292,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test5)
 /** Test export of a VF */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test6)
 {
-	auto film = new_test_film2 ("ffmpeg_encoder_h264_test6_ov");
+	auto film = new_test_film("ffmpeg_encoder_h264_test6_ov");
 	film->examine_and_add_content (make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png"));
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (film);
 
-	auto film2 = new_test_film2 ("ffmpeg_encoder_h264_test6_vf");
+	auto film2 = new_test_film("ffmpeg_encoder_h264_test6_vf");
 	auto ov = make_shared<DCPContent>("build/test/ffmpeg_encoder_h264_test6_ov/" + film->dcp_name(false));
 	film2->examine_and_add_content (ov);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -323,7 +323,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_3d_dcp_to_h264)
 	cl.add(output);
 
 	auto dcp = make_shared<DCPContent>(TestPaths::private_data() / "xm");
-	auto film2 = new_test_film2 ("ffmpeg_encoder_3d_dcp_to_h264_export", {dcp});
+	auto film2 = new_test_film("ffmpeg_encoder_3d_dcp_to_h264_export", {dcp});
 
 	auto job = make_shared<TranscodeJob>(film2, TranscodeJob::ChangedBehaviour::IGNORE);
 	FFmpegFilmEncoder encoder(film2, job, output, ExportFormat::H264_AAC, true, false, false, 23);
@@ -338,7 +338,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 {
 	auto L = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
 	auto R = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
-	auto film = new_test_film2 ("ffmpeg_encoder_h264_test7_data", {L, R});
+	auto film = new_test_film("ffmpeg_encoder_h264_test7_data", {L, R});
 	L->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
 	L->set_position (film, DCPTime());
 	R->video->set_frame_type (VideoFrameType::THREE_D_RIGHT);
@@ -347,7 +347,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 	make_and_verify_dcp (film);
 
 	auto dcp = make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2 ("ffmpeg_encoder_h264_test7_export", {dcp});
+	auto film2 = new_test_film("ffmpeg_encoder_h264_test7_export", {dcp});
 
 	auto job = make_shared<TranscodeJob> (film2, TranscodeJob::ChangedBehaviour::IGNORE);
 	FFmpegFilmEncoder encoder(film2, job, "build/test/ffmpeg_encoder_h264_test7.mp4", ExportFormat::H264_AAC, true, false, false, 23);
@@ -358,7 +358,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test7)
 BOOST_AUTO_TEST_CASE(ffmpeg_encoder_2d_content_in_3d_project)
 {
 	auto content = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
-	auto film = new_test_film2("ffmpeg_encoder_2d_content_in_3d_project", { content });
+	auto film = new_test_film("ffmpeg_encoder_2d_content_in_3d_project", { content });
 	film->set_three_d(true);
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
@@ -370,7 +370,7 @@ BOOST_AUTO_TEST_CASE(ffmpeg_encoder_2d_content_in_3d_project)
 /** Stereo project with mixdown-to-stereo set */
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 {
-	auto film = new_test_film2("ffmpeg_encoder_h264_test4");
+	auto film = new_test_film("ffmpeg_encoder_h264_test4");
 	film->examine_and_add_content(make_shared<DCPContent>("test/data/scope_dcp"));
 	BOOST_REQUIRE(!wait_for_jobs());
 	film->set_audio_channels (2);
@@ -385,7 +385,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test8)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
 {
 	auto c = make_shared<ImageContent>(TestPaths::private_data() / "bbc405.png");
-	auto film = new_test_film2("ffmpeg_encoder_prores_test9", { c });
+	auto film = new_test_film("ffmpeg_encoder_prores_test9", { c });
 	film->set_name ("ffmpeg_encoder_prores_test9");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (12);
@@ -406,7 +406,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_test9)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop)
 {
 	auto dcp = make_shared<DCPContent>("test/data/import_dcp_test2");
-	auto film = new_test_film2 ("ffmpeg_encoder_prores_from_dcp_with_crop", { dcp });
+	auto film = new_test_film("ffmpeg_encoder_prores_from_dcp_with_crop", { dcp });
 	dcp->video->set_left_crop (32);
 	dcp->video->set_right_crop (32);
 	film->write_metadata ();
@@ -421,7 +421,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_from_dcp_with_crop)
 BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_from_dcp_with_crop)
 {
 	auto dcp = make_shared<DCPContent>("test/data/import_dcp_test2");
-	auto film = new_test_film2 ("ffmpeg_encoder_h264_from_dcp_with_crop", { dcp });
+	auto film = new_test_film("ffmpeg_encoder_h264_from_dcp_with_crop", { dcp });
 	dcp->video->set_left_crop (32);
 	dcp->video->set_right_crop (32);
 	film->write_metadata ();
@@ -437,7 +437,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_h264_with_reels)
 {
 	auto content1 = content_factory("test/data/flat_red.png")[0];
 	auto content2 = content_factory("test/data/flat_red.png")[0];
-	auto film = new_test_film2 ("ffmpeg_encoder_h264_with_reels", { content1, content2 });
+	auto film = new_test_film("ffmpeg_encoder_h264_with_reels", { content1, content2 });
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	content1->video->set_length (240);
 	content2->video->set_length (240);
@@ -464,7 +464,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_1)
 	Cleanup cl;
 
 	auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0];
-	auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_1", { content });
+	auto film = new_test_film("ffmpeg_encoder_prores_regression_1", { content });
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
 	FFmpegFilmEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_1.mov", ExportFormat::PRORES_HQ, false, true, false, 23);
@@ -484,7 +484,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 	dcpomatic_log->set_types(logs | LogEntry::TYPE_DEBUG_PLAYER);
 
 	auto content = content_factory(TestPaths::private_data() / "tge_clip.mkv")[0];
-	auto film = new_test_film2 ("ffmpeg_encoder_prores_regression_2", { content });
+	auto film = new_test_film("ffmpeg_encoder_prores_regression_2", { content });
 
 	auto job = make_shared<TranscodeJob>(film, TranscodeJob::ChangedBehaviour::IGNORE);
 	FFmpegFilmEncoder encoder (film, job, "build/test/ffmpeg_encoder_prores_regression_2.mov", ExportFormat::PRORES_HQ, false, true, false, 23);
@@ -500,7 +500,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_encoder_prores_regression_2)
 BOOST_AUTO_TEST_CASE(ffmpeg_encoder_missing_frame_at_end)
 {
 	auto content = content_factory(TestPaths::private_data() / "1s1f.mov");
-	auto film = new_test_film2("ffmpeg_encoder_missing_frame_at_end", content);
+	auto film = new_test_film("ffmpeg_encoder_missing_frame_at_end", content);
 
 	boost::filesystem::path output("build/test/ffmpeg_encoder_missing_frame_at_end.mov");
 	boost::filesystem::path log("build/test/ffmpeg_encoder_missing_frame_at_end.log");
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index 9435e4637..c07900db8 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -42,7 +42,7 @@ using namespace dcpomatic;
 BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
 {
 	auto content = make_shared<FFmpegContent>("test/data/count300bd24.m2ts");
-	auto film = new_test_film2("ffmpeg_examiner_test", { content });
+	auto film = new_test_film("ffmpeg_examiner_test", { content });
 	auto examiner = make_shared<FFmpegExaminer>(content);
 
 	BOOST_CHECK_EQUAL (examiner->first_video().get().get(), ContentTime::from_seconds(600).get());
diff --git a/test/ffmpeg_properties_test.cc b/test/ffmpeg_properties_test.cc
index 15773ec2f..1e0cdc42f 100644
--- a/test/ffmpeg_properties_test.cc
+++ b/test/ffmpeg_properties_test.cc
@@ -37,7 +37,7 @@ colour_range_test(string name, boost::filesystem::path file, string ref)
 {
 	auto content = content_factory(file);
 	BOOST_REQUIRE(!content.empty());
-	auto film = new_test_film2(String::compose("ffmpeg_properties_test_%1", name), { content.front() });
+	auto film = new_test_film(String::compose("ffmpeg_properties_test_%1", name), { content.front() });
 
 	auto properties = content.front()->user_properties(film);
 	auto iter = std::find_if(properties.begin(), properties.end(), [](UserProperty const& property) { return property.key == "Colour range"; });
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index da9089a2e..642d85ff2 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -42,7 +42,7 @@ using namespace dcpomatic;
 BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 {
 	auto content = make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("ffmpeg_pts_offset_test", { content });
+	auto film = new_test_film("ffmpeg_pts_offset_test", { content });
 
 	content->audio = make_shared<AudioContent>(content.get());
 	content->audio->add_stream (shared_ptr<FFmpegAudioStream> (new FFmpegAudioStream));
diff --git a/test/file_extension_test.cc b/test/file_extension_test.cc
index 87b55114a..99075fd1c 100644
--- a/test/file_extension_test.cc
+++ b/test/file_extension_test.cc
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (interop_file_extension_test)
 	auto video = content_factory("test/data/flat_red.png")[0];
 	auto audio = content_factory("test/data/sine_440.wav")[0];
 	auto sub = content_factory("test/data/15s.srt")[0];
-	auto film = new_test_film2("interop_file_extension_test", { video, audio, sub });
+	auto film = new_test_film("interop_file_extension_test", { video, audio, sub });
 	film->set_interop(true);
 	sub->only_text()->set_language(dcp::LanguageTag("de"));
 
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (smpte_file_extension_test)
 	auto video = content_factory("test/data/flat_red.png")[0];
 	auto audio = content_factory("test/data/sine_440.wav")[0];
 	auto sub = content_factory("test/data/15s.srt")[0];
-	auto film = new_test_film2("smpte_file_extension_test", { video, audio, sub });
+	auto film = new_test_film("smpte_file_extension_test", { video, audio, sub });
 	film->set_interop(false);
 
 	make_and_verify_dcp(
diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index 2a0a48172..2aa81cd4f 100644
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
 	auto r = make_shared<FFmpegContent>("test/data/flat_red.png");
 	auto g = make_shared<FFmpegContent>("test/data/flat_green.png");
 	auto b = make_shared<FFmpegContent>("test/data/flat_blue.png");
-	auto film = new_test_film2("file_naming_test", { r, g, b });
+	auto film = new_test_film("file_naming_test", { r, g, b });
 	film->set_video_frame_rate (24);
 
 	r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
@@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
 	auto r = make_shared<FFmpegContent>("test/data/flät_red.png");
 	auto g = make_shared<FFmpegContent>("test/data/flat_green.png");
 	auto b = make_shared<FFmpegContent>("test/data/flat_blue.png");
-	auto film = new_test_film2("file_naming_test2", { r, g, b });
+	auto film = new_test_film("file_naming_test2", { r, g, b });
 
 	r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
 	r->set_video_frame_rate(film, 24);
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE (subtitle_file_naming)
 	Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t ostrabagalous %c"));
 
 	auto content = content_factory("test/data/15s.srt");
-	auto film = new_test_film2("subtitle_file_naming", content);
+	auto film = new_test_film("subtitle_file_naming", content);
 	film->set_interop(false);
 
 	make_and_verify_dcp (
@@ -195,7 +195,7 @@ BOOST_AUTO_TEST_CASE(remove_bad_characters_from_template)
 	Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%c%z"));
 
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2("remove_bad_characters_from_template", content);
+	auto film = new_test_film("remove_bad_characters_from_template", content);
 	make_and_verify_dcp(
 		film,
 		{
diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index e441ec9e0..b99d1a572 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -47,7 +47,7 @@ using std::vector;
 
 BOOST_AUTO_TEST_CASE (film_metadata_test)
 {
-	auto film = new_test_film2("film_metadata_test");
+	auto film = new_test_film("film_metadata_test");
 	auto dir = test_film_dir ("film_metadata_test");
 
 	film->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211");
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (multiple_text_nodes_are_allowed)
 
 	auto subs = content_factory("test/data/15s.srt")[0];
 	auto caps = content_factory("test/data/15s.srt")[0];
-	auto film = new_test_film2("multiple_text_nodes_are_allowed1", { subs, caps }, &cl);
+	auto film = new_test_film("multiple_text_nodes_are_allowed1", { subs, caps }, &cl);
 	caps->only_text()->set_type(TextType::CLOSED_CAPTION);
 	make_and_verify_dcp (
 		film,
@@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE (multiple_text_nodes_are_allowed)
 		});
 
 	auto reload = make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2("multiple_text_nodes_are_allowed2", { reload });
+	auto film2 = new_test_film("multiple_text_nodes_are_allowed2", { reload });
 	film2->write_metadata ();
 
 	auto test = make_shared<Film>(boost::filesystem::path("build/test/multiple_text_nodes_are_allowed2"));
@@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE (metadata_video_range_guessed_for_png)
 BOOST_AUTO_TEST_CASE(effect_node_not_inserted_incorrectly)
 {
 	auto sub = content_factory("test/data/15s.srt");
-	auto film = new_test_film2("effect_node_not_inserted_incorrectly", sub);
+	auto film = new_test_film("effect_node_not_inserted_incorrectly", sub);
 	film->write_metadata();
 
 	namespace fs = boost::filesystem;
diff --git a/test/film_test.cc b/test/film_test.cc
index e8f04dc93..3493c79ce 100644
--- a/test/film_test.cc
+++ b/test/film_test.cc
@@ -31,16 +31,16 @@ BOOST_AUTO_TEST_CASE(film_contains_atmos_content_test)
 	auto image = content_factory("test/data/flat_red.png")[0];
 	auto sound = content_factory("test/data/white.wav")[0];
 
-	auto film1 = new_test_film2("film_contains_atmos_content_test1", { atmos, image, sound });
+	auto film1 = new_test_film("film_contains_atmos_content_test1", { atmos, image, sound });
 	BOOST_CHECK(film1->contains_atmos_content());
 
-	auto film2 = new_test_film2("film_contains_atmos_content_test2", { sound, atmos, image });
+	auto film2 = new_test_film("film_contains_atmos_content_test2", { sound, atmos, image });
 	BOOST_CHECK(film2->contains_atmos_content());
 
-	auto film3 = new_test_film2("film_contains_atmos_content_test3", { image, sound, atmos });
+	auto film3 = new_test_film("film_contains_atmos_content_test3", { image, sound, atmos });
 	BOOST_CHECK(film3->contains_atmos_content());
 
-	auto film4 = new_test_film2("film_contains_atmos_content_test4", { image, sound });
+	auto film4 = new_test_film("film_contains_atmos_content_test4", { image, sound });
 	BOOST_CHECK(!film4->contains_atmos_content());
 }
 
diff --git a/test/find_missing_test.cc b/test/find_missing_test.cc
index 51ae5800c..c85ddea7f 100644
--- a/test/find_missing_test.cc
+++ b/test/find_missing_test.cc
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (find_missing_test_with_single_files)
 	copy_file ("test/data/flat_red.png", content_dir / "C.png");
 
 	/* Make a film with that content */
-	auto film = new_test_film2 (name + "_film", {
+	auto film = new_test_film(name + "_film", {
 		content_factory(content_dir / "A.png")[0],
 		content_factory(content_dir / "B.png")[0],
 		content_factory(content_dir / "C.png")[0]
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (find_missing_test_with_multiple_files)
 	}
 
 	/* Make a film containing that DCP */
-	auto film = new_test_film2 (name + "_film", { make_shared<DCPContent>(content_dir) });
+	auto film = new_test_film(name + "_film", { make_shared<DCPContent>(content_dir) });
 	film->write_metadata ();
 
 	/* Move the DCP's content elsewhere */
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE (find_missing_test_with_multiple_files_one_incorrect)
 	}
 
 	/* Make a film containing that DCP */
-	auto film = new_test_film2 (name + "_film", { make_shared<DCPContent>(content_dir) });
+	auto film = new_test_film(name + "_film", { make_shared<DCPContent>(content_dir) });
 	film->write_metadata ();
 
 	/* Move the DCP's content elsewhere */
diff --git a/test/frame_rate_test.cc b/test/frame_rate_test.cc
index 9b903fef5..d87f7bfc5 100644
--- a/test/frame_rate_test.cc
+++ b/test/frame_rate_test.cc
@@ -45,7 +45,7 @@
 BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_single)
 {
 	auto content = std::make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("best_dcp_frame_rate_test_single", { content });
+	auto film = new_test_film("best_dcp_frame_rate_test_single", { content });
 
 	/* Run some tests with a limited range of allowed rates */
 
@@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
 {
 	auto A = std::make_shared<FFmpegContent>("test/data/test.mp4");
 	auto B = std::make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("best_dcp_frame_rate_test_double", { A, B });
+	auto film = new_test_film("best_dcp_frame_rate_test_double", { A, B });
 
 	/* Run some tests with a limited range of allowed rates */
 
@@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE (best_dcp_frame_rate_test_double)
 BOOST_AUTO_TEST_CASE (audio_sampling_rate_test)
 {
 	auto content = std::make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("audio_sampling_rate_test", { content });
+	auto film = new_test_film("audio_sampling_rate_test", { content });
 
 	std::list<int> afr = { 24, 25, 30 };
 	Config::instance()->set_allowed_dcp_frame_rates (afr);
diff --git a/test/guess_crop_test.cc b/test/guess_crop_test.cc
index ccced0b3e..c58432382 100644
--- a/test/guess_crop_test.cc
+++ b/test/guess_crop_test.cc
@@ -35,7 +35,7 @@ using namespace dcpomatic;
 BOOST_AUTO_TEST_CASE (guess_crop_image_test1)
 {
 	auto content = content_factory(TestPaths::private_data() / "arrietty_724.tiff");
-	auto film = new_test_film2 ("guess_crop_image_test1", content);
+	auto film = new_test_film("guess_crop_image_test1", content);
 
 	BOOST_CHECK (guess_crop(film, content[0], 0.1, {}) == Crop(0, 0, 11, 11));
 }
@@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE (guess_crop_image_test1)
 BOOST_AUTO_TEST_CASE (guess_crop_image_test2)
 {
 	auto content = content_factory(TestPaths::private_data() / "prophet_frame.tiff");
-	auto film = new_test_film2 ("guess_crop_image_test2", content);
+	auto film = new_test_film("guess_crop_image_test2", content);
 
 	BOOST_CHECK(guess_crop(film, content[0], 0.1, {}) == Crop(0, 0, 22, 22));
 }
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (guess_crop_image_test2)
 BOOST_AUTO_TEST_CASE (guess_crop_image_test3)
 {
 	auto content = content_factory(TestPaths::private_data() / "pillarbox.png");
-	auto film = new_test_film2 ("guess_crop_image_test3", content);
+	auto film = new_test_film("guess_crop_image_test3", content);
 
 	BOOST_CHECK(guess_crop(film, content[0], 0.1, {}) == Crop(113, 262, 0, 0));
 }
diff --git a/test/hints_test.cc b/test/hints_test.cc
index 949ba18c0..8768815ad 100644
--- a/test/hints_test.cc
+++ b/test/hints_test.cc
@@ -72,7 +72,7 @@ static
 void
 check (TextType type, string name, optional<string> expected_hint = optional<string>())
 {
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	auto content = content_factory("test/data/" + name + ".srt")[0];
 	content->text.front()->set_type (type);
 	content->text.front()->set_language (dcp::LanguageTag("en-US"));
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE (hint_subtitle_mxf_too_big)
 {
 	string const name = "hint_subtitle_mxf_too_big";
 
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 
 	for (int i = 0; i < 4; ++i) {
 		dcp::File fake_font("build/test/hint_subtitle_mxf_too_big.ttf", "w");
@@ -218,7 +218,7 @@ BOOST_AUTO_TEST_CASE (hint_closed_caption_xml_too_big)
 {
 	string const name = "hint_closed_caption_xml_too_big";
 
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 
 	dcp::File ccap(String::compose("build/test/%1.srt", name), "w");
 	BOOST_REQUIRE (ccap);
@@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE (hint_closed_caption_xml_too_big)
 
 BOOST_AUTO_TEST_CASE (hints_destroyed_while_running)
 {
-	auto film = new_test_film2 ("hints_destroyed_while_running");
+	auto film = new_test_film("hints_destroyed_while_running");
 	auto content = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -265,7 +265,7 @@ BOOST_AUTO_TEST_CASE (hints_destroyed_while_running)
 BOOST_AUTO_TEST_CASE (hints_audio_with_no_language)
 {
 	auto content = content_factory("test/data/sine_440.wav")[0];
-	auto film = new_test_film2 ("hints_audio_with_no_language", { content });
+	auto film = new_test_film("hints_audio_with_no_language", { content });
 	content->audio->set_gain (-6);
 
 	auto hints = get_hints (film);
@@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE (hints_certificate_validity)
 
 	Config::instance()->set_signer_chain(make_shared<dcp::CertificateChain>(openssl_path(), 40 * 365));
 
-	auto film = new_test_film2 ("hints_certificate_validity");
+	auto film = new_test_film("hints_certificate_validity");
 	auto hints = get_hints (film);
 	BOOST_REQUIRE_EQUAL (hints.size(), 1U);
 	BOOST_CHECK_EQUAL (
diff --git a/test/image_content_fade_test.cc b/test/image_content_fade_test.cc
index d7f03ad51..5ac63405a 100644
--- a/test/image_content_fade_test.cc
+++ b/test/image_content_fade_test.cc
@@ -33,7 +33,7 @@ using std::list;
 
 BOOST_AUTO_TEST_CASE (image_content_fade_test)
 {
-	auto film = new_test_film2 ("image_content_fade_test");
+	auto film = new_test_film("image_content_fade_test");
 	auto content = content_factory("test/data/flat_red.png")[0];
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc
index 5ced3f9a4..e9f7f068b 100644
--- a/test/import_dcp_test.cc
+++ b/test/import_dcp_test.cc
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 	ConfigRestorer cr;
 
 	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
-	auto A = new_test_film2("import_dcp_test", { c });
+	auto A = new_test_film("import_dcp_test", { c });
 	A->set_encrypted (true);
 	A->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	make_and_verify_dcp (A);
@@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test)
 
 	auto d = make_shared<DCPContent>("build/test/import_dcp_test/" + A->dcp_name());
 	d->add_kdm (kdm);
-	auto B = new_test_film2("import_dcp_test2", { d });
+	auto B = new_test_film("import_dcp_test2", { d });
 	B->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	B->set_audio_channels(16);
 	make_and_verify_dcp (B);
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 
 	/* Make a DCP with some markers */
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2 ("import_dcp_markers_test", content, &cl);
+	auto film = new_test_film("import_dcp_markers_test", content, &cl);
 
 	content[0]->video->set_length (24 * 60 * 10);
 
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 
 	/* Import the DCP to a new film and check the markers */
 	auto imported = make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2 ("import_dcp_markers_test2", {imported}, &cl);
+	auto film2 = new_test_film("import_dcp_markers_test2", {imported}, &cl);
 	film2->write_metadata ();
 
 	/* When import_dcp_markers_test was made a LFOC marker will automatically
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_markers_test)
 BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
 {
 	/* Make a DCP with some ratings and a content version */
-	auto film = new_test_film2 ("import_dcp_metadata_test");
+	auto film = new_test_film("import_dcp_metadata_test");
 	auto content = content_factory("test/data/flat_red.png")[0];
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_metadata_test)
 	make_and_verify_dcp (film);
 
 	/* Import the DCP to a new film and check the metadata */
-	auto film2 = new_test_film2 ("import_dcp_metadata_test2");
+	auto film2 = new_test_film("import_dcp_metadata_test2");
 	auto imported = make_shared<DCPContent>(film->dir(film->dcp_name()));
 	film2->examine_and_add_content (imported);
 	BOOST_REQUIRE (!wait_for_jobs());
diff --git a/test/interrupt_encoder_test.cc b/test/interrupt_encoder_test.cc
index 2da9d91ab..c786a3110 100644
--- a/test/interrupt_encoder_test.cc
+++ b/test/interrupt_encoder_test.cc
@@ -46,7 +46,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE (interrupt_encoder_test)
 {
 	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "prophet_long_clip.mkv");
-	auto film = new_test_film2("interrupt_encoder_test", { content });
+	auto film = new_test_film("interrupt_encoder_test", { content });
 
 	make_dcp (film, TranscodeJob::ChangedBehaviour::IGNORE);
 
diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc
index 6384ab8a4..3897aabbe 100644
--- a/test/isdcf_name_test.cc
+++ b/test/isdcf_name_test.cc
@@ -47,7 +47,7 @@ using std::string;
 BOOST_AUTO_TEST_CASE (isdcf_name_test)
 {
 	auto audio = content_factory("test/data/sine_440.wav")[0];
-	auto film = new_test_film2("isdcf_name_test", { audio });
+	auto film = new_test_film("isdcf_name_test", { audio });
 
 	/* A basic test */
 
@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test)
 BOOST_AUTO_TEST_CASE(isdcf_name_with_atmos)
 {
 	auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
-	auto film = new_test_film2("isdcf_name_with_atmos", content);
+	auto film = new_test_film("isdcf_name_with_atmos", content);
 	film->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18);
 	film->set_name("Hello");
 
@@ -251,7 +251,7 @@ BOOST_AUTO_TEST_CASE(isdcf_name_with_atmos)
 BOOST_AUTO_TEST_CASE(isdcf_name_with_ccap)
 {
 	auto content = content_factory("test/data/short.srt")[0];
-	auto film = new_test_film2("isdcf_name_with_ccap", { content });
+	auto film = new_test_film("isdcf_name_with_ccap", { content });
 	content->text[0]->set_use(true);
 	content->text[0]->set_type(TextType::CLOSED_CAPTION);
 	content->text[0]->set_dcp_track(DCPTextTrack("Foo", dcp::LanguageTag("de-DE")));
diff --git a/test/j2k_encode_threading_test.cc b/test/j2k_encode_threading_test.cc
index f63f7c829..1f57f4143 100644
--- a/test/j2k_encode_threading_test.cc
+++ b/test/j2k_encode_threading_test.cc
@@ -43,7 +43,7 @@ using std::list;
 
 BOOST_AUTO_TEST_CASE(local_threads_created_and_destroyed)
 {
-	auto film = new_test_film2("local_threads_created_and_destroyed", {});
+	auto film = new_test_film("local_threads_created_and_destroyed", {});
 	Writer writer(film, {}, "foo");
 	J2KEncoder encoder(film, writer);
 
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(local_threads_created_and_destroyed)
 
 BOOST_AUTO_TEST_CASE(remote_threads_created_and_destroyed)
 {
-	auto film = new_test_film2("remote_threads_created_and_destroyed", {});
+	auto film = new_test_film("remote_threads_created_and_destroyed", {});
 	Writer writer(film, {}, "foo");
 	J2KEncoder encoder(film, writer);
 
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(remote_threads_created_and_destroyed)
 BOOST_AUTO_TEST_CASE(frames_not_lost_when_threads_disappear)
 {
 	auto content = content_factory(TestPaths::private_data() / "clapperboard.mp4");
-	auto film = new_test_film2("frames_not_lost", content);
+	auto film = new_test_film("frames_not_lost", content);
 	film->write_metadata();
 	auto job = make_dcp(film, TranscodeJob::ChangedBehaviour::IGNORE);
 	auto encoder = dynamic_cast<J2KEncoder*>(dynamic_pointer_cast<DCPFilmEncoder>(job->_encoder)->_encoder.get());
diff --git a/test/j2k_encoder_test.cc b/test/j2k_encoder_test.cc
index e231dce88..083a61cf8 100644
--- a/test/j2k_encoder_test.cc
+++ b/test/j2k_encoder_test.cc
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(j2k_encoder_deadlock_test)
 {
 	ConfigRestorer cr;
 
-	auto film = new_test_film2("j2k_encoder_deadlock_test");
+	auto film = new_test_film("j2k_encoder_deadlock_test");
 
 	/* Don't call ::start() on this Writer, so it can never write anything */
 	Writer writer(film, {}, {});
diff --git a/test/j2k_video_bit_rate_test.cc b/test/j2k_video_bit_rate_test.cc
index f40732c5b..b3eccd98a 100644
--- a/test/j2k_video_bit_rate_test.cc
+++ b/test/j2k_video_bit_rate_test.cc
@@ -47,7 +47,7 @@ check (int target_bits_per_second)
 
 	string const name = "bandwidth_test_" + dcp::raw_convert<string> (target_bits_per_second);
 	auto content = make_shared<ImageContent>(TestPaths::private_data() / "prophet_frame.tiff");
-	auto film = new_test_film2(name, { content }, &cl);
+	auto film = new_test_film(name, { content }, &cl);
 	film->set_video_bit_rate(VideoEncoding::JPEG2000, target_bits_per_second);
 	content->video->set_length (24 * duration);
 	make_and_verify_dcp (
diff --git a/test/kdm_cli_test.cc b/test/kdm_cli_test.cc
index 3fd20d478..f8c85cb5a 100644
--- a/test/kdm_cli_test.cc
+++ b/test/kdm_cli_test.cc
@@ -273,7 +273,7 @@ BOOST_AUTO_TEST_CASE(kdm_cli_specify_cert)
 	boost::system::error_code ec;
 	boost::filesystem::remove(kdm_filename, ec);
 
-	auto film = new_test_film2("kdm_cli_specify_cert", content_factory("test/data/flat_red.png"));
+	auto film = new_test_film("kdm_cli_specify_cert", content_factory("test/data/flat_red.png"));
 	film->set_encrypted(true);
 	film->set_name("KDMCLI");
 	film->set_use_isdcf_name(false);
diff --git a/test/kdm_naming_test.cc b/test/kdm_naming_test.cc
index c5c7c2678..fe7da7f31 100644
--- a/test/kdm_naming_test.cc
+++ b/test/kdm_naming_test.cc
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE (single_kdm_naming_test)
 
 	/* Film */
 	boost::filesystem::remove_all ("build/test/single_kdm_naming_test");
-	auto film = new_test_film2 ("single_kdm_naming_test");
+	auto film = new_test_film("single_kdm_naming_test");
 	film->set_name ("my_great_film");
 	film->examine_and_add_content (content_factory("test/data/flat_black.png")[0]);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE(directory_kdm_naming_test)
 
 	/* Film */
 	boost::filesystem::remove_all ("build/test/directory_kdm_naming_test");
-	auto film = new_test_film2 (
+	auto film = new_test_film(
 		"directory_kdm_naming_test",
 		{ content_factory("test/data/flat_black.png")[0] }
 		);
diff --git a/test/map_cli_test.cc b/test/map_cli_test.cc
index 6b94be6fe..aaf5b944f 100644
--- a/test/map_cli_test.cc
+++ b/test/map_cli_test.cc
@@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE(map_simple_dcp_copy)
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2(name + "_in", content);
+	auto film = new_test_film(name + "_in", content);
 	make_and_verify_dcp(film);
 
 	vector<string> const args = {
@@ -123,7 +123,7 @@ BOOST_AUTO_TEST_CASE(map_simple_dcp_copy_by_id)
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2(name + "_in", content);
+	auto film = new_test_film(name + "_in", content);
 	make_and_verify_dcp(film);
 
 	dcp::CPL cpl(find_cpl(film->dir(film->dcp_name())));
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE(map_simple_dcp_copy_with_symlinks)
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2(name + "_in", content);
+	auto film = new_test_film(name + "_in", content);
 	make_and_verify_dcp(film);
 
 	vector<string> const args = {
@@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE(map_simple_dcp_copy_with_hardlinks)
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2(name + "_in", content);
+	auto film = new_test_film(name + "_in", content);
 	make_and_verify_dcp(film);
 
 	vector<string> const args = {
@@ -220,7 +220,7 @@ BOOST_AUTO_TEST_CASE(map_simple_interop_dcp_with_subs)
 
 	auto picture = content_factory("test/data/flat_red.png").front();
 	auto subs = content_factory("test/data/15s.srt").front();
-	auto film = new_test_film2(name + "_in", { picture, subs });
+	auto film = new_test_film(name + "_in", { picture, subs });
 	film->set_interop(true);
 	subs->only_text()->set_language(dcp::LanguageTag("de"));
 	make_and_verify_dcp(film, {dcp::VerificationNote::Code::INVALID_STANDARD});
@@ -250,13 +250,13 @@ test_map_ov_vf_copy(vector<string> extra_args = {})
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto ov_content = content_factory("test/data/flat_red.png");
-	auto ov_film = new_test_film2(name + "_ov", ov_content);
+	auto ov_film = new_test_film(name + "_ov", ov_content);
 	make_and_verify_dcp(ov_film);
 
 	auto const ov_dir = ov_film->dir(ov_film->dcp_name());
 	auto vf_ov = make_shared<DCPContent>(ov_dir);
 	auto vf_sound = content_factory("test/data/sine_440.wav").front();
-	auto vf_film = new_test_film2(name + "_vf", { vf_ov, vf_sound });
+	auto vf_film = new_test_film(name + "_vf", { vf_ov, vf_sound });
 	vf_ov->set_reference_video(true);
 	make_and_verify_dcp(vf_film, {dcp::VerificationNote::Code::EXTERNAL_ASSET}, false);
 
@@ -301,7 +301,7 @@ BOOST_AUTO_TEST_CASE(map_ov_vf_copy_multiple_reference)
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto ov_content = content_factory("test/data/flat_red.png");
-	auto ov_film = new_test_film2(name + "_ov", ov_content);
+	auto ov_film = new_test_film(name + "_ov", ov_content);
 	make_and_verify_dcp(ov_film);
 
 	auto const ov_dir = ov_film->dir(ov_film->dcp_name());
@@ -309,7 +309,7 @@ BOOST_AUTO_TEST_CASE(map_ov_vf_copy_multiple_reference)
 	auto vf_ov1 = make_shared<DCPContent>(ov_dir);
 	auto vf_ov2 = make_shared<DCPContent>(ov_dir);
 	auto vf_sound = content_factory("test/data/sine_440.wav").front();
-	auto vf_film = new_test_film2(name + "_vf", { vf_ov1, vf_ov2, vf_sound });
+	auto vf_film = new_test_film(name + "_vf", { vf_ov1, vf_ov2, vf_sound });
 	vf_film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	vf_ov2->set_position(vf_film, vf_ov1->end(vf_film));
 	vf_ov1->set_reference_video(true);
@@ -349,7 +349,7 @@ BOOST_AUTO_TEST_CASE(map_simple_dcp_copy_with_rename)
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2(name + "_in", content);
+	auto film = new_test_film(name + "_in", content);
 	make_and_verify_dcp(film);
 
 	vector<string> const args = {
@@ -408,7 +408,7 @@ test_two_cpls_each_with_subs(string name, bool interop)
 	for (auto i = 0; i < 2; ++i) {
 		auto picture = content_factory("test/data/flat_red.png").front();
 		auto subs = content_factory("test/data/15s.srt").front();
-		films[i] = new_test_film2(String::compose("%1_%2_in", name, i), { picture, subs });
+		films[i] = new_test_film(String::compose("%1_%2_in", name, i), { picture, subs });
 		films[i]->set_interop(interop);
 		subs->only_text()->set_language(dcp::LanguageTag("de"));
 		make_and_verify_dcp(films[i], acceptable_errors);
@@ -453,7 +453,7 @@ BOOST_AUTO_TEST_CASE(map_with_given_config)
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2(name + "_in", content);
+	auto film = new_test_film(name + "_in", content);
 	make_and_verify_dcp(film);
 
 	vector<string> const args = {
@@ -488,7 +488,7 @@ BOOST_AUTO_TEST_CASE(map_multireel_interop_ov_and_vf_adding_ccaps)
 		content_factory("test/data/flat_red.png")[0]
 	};
 
-	auto ov = new_test_film2(name + "_ov", { video[0], video[1], video[2] });
+	auto ov = new_test_film(name + "_ov", { video[0], video[1], video[2] });
 	ov->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	ov->set_interop(true);
 	make_and_verify_dcp(ov, { dcp::VerificationNote::Code::INVALID_STANDARD });
@@ -501,7 +501,7 @@ BOOST_AUTO_TEST_CASE(map_multireel_interop_ov_and_vf_adding_ccaps)
 		content_factory("test/data/short.srt")[0]
 	};
 
-	auto vf = new_test_film2(name + "_vf", { ov_dcp, ccap[0], ccap[1], ccap[2] });
+	auto vf = new_test_film(name + "_vf", { ov_dcp, ccap[0], ccap[1], ccap[2] });
 	vf->set_interop(true);
 	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	ov_dcp->set_reference_video(true);
@@ -548,7 +548,7 @@ BOOST_AUTO_TEST_CASE(map_uses_config_for_issuer_and_creator)
 	string const out = String::compose("build/test/%1_out", name);
 
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2(name + "_in", content);
+	auto film = new_test_film(name + "_in", content);
 	make_and_verify_dcp(film);
 
 	vector<string> const args = {
@@ -580,7 +580,7 @@ BOOST_AUTO_TEST_CASE(map_handles_interop_png_subs)
 {
 	string const name = "map_handles_interop_png_subs";
 	auto arrietty = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0];
-	auto film = new_test_film2(name + "_input", { arrietty });
+	auto film = new_test_film(name + "_input", { arrietty });
 	film->set_interop(true);
 	arrietty->set_trim_end(dcpomatic::ContentTime::from_seconds(110));
 	arrietty->text[0]->set_use(true);
diff --git a/test/markers_test.cc b/test/markers_test.cc
index a3c46af44..f7ff3a6b5 100644
--- a/test/markers_test.cc
+++ b/test/markers_test.cc
@@ -43,7 +43,7 @@ using boost::optional;
 BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1)
 {
 	string const name = "automatic_ffoc_lfoc_markers_test1";
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	film->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test1)
 BOOST_AUTO_TEST_CASE (automatic_ffoc_lfoc_markers_test2)
 {
 	string const name = "automatic_ffoc_lfoc_markers_test2";
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	film->examine_and_add_content (content_factory("test/data/flat_red.png")[0]);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE(markers_correct_with_reels)
 	string const name = "markers_correct_with_reels";
 	auto content1 = content_factory("test/data/flat_red.png")[0];
 	auto content2 = content_factory("test/data/flat_red.png")[0];
-	auto film = new_test_film2(name, { content1, content2});
+	auto film = new_test_film(name, { content1, content2});
 
 	film->set_interop(false);
 	film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
@@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE(markers_correct_with_reels)
 BOOST_AUTO_TEST_CASE(no_markers_with_interop)
 {
 	string const name = "no_markers_with_interop";
-	auto film = new_test_film2(name, content_factory("test/data/flat_red.png"));
+	auto film = new_test_film(name, content_factory("test/data/flat_red.png"));
 
 	film->set_interop(true);
 	make_and_verify_dcp(film, { dcp::VerificationNote::Code::INVALID_STANDARD });
diff --git a/test/mca_subdescriptors_test.cc b/test/mca_subdescriptors_test.cc
index e34a909f4..ad146700e 100644
--- a/test/mca_subdescriptors_test.cc
+++ b/test/mca_subdescriptors_test.cc
@@ -42,7 +42,7 @@ test_descriptors(int mxf_channels, vector<dcp::Channel> active_channels, vector<
 	for (auto i = 0; i < mxf_channels; ++i) {
 		content.push_back(content_factory("test/data/C.wav").front());
 	}
-	auto film = new_test_film2("mca_subdescriptors_written_correctly", content);
+	auto film = new_test_film("mca_subdescriptors_written_correctly", content);
 	film->set_interop(false);
 	film->set_audio_channels(mxf_channels);
 
diff --git a/test/no_use_video_test.cc b/test/no_use_video_test.cc
index 45ba264cd..cd8df90cb 100644
--- a/test/no_use_video_test.cc
+++ b/test/no_use_video_test.cc
@@ -50,7 +50,7 @@ using std::make_shared;
  */
 BOOST_AUTO_TEST_CASE (no_use_video_test1)
 {
-	auto film = new_test_film2 ("no_use_video_test1");
+	auto film = new_test_film("no_use_video_test1");
 	auto A = content_factory("test/data/flat_red.png")[0];
 	auto B = content_factory("test/data/flat_green.png")[0];
 	film->examine_and_add_content (A);
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test2)
 
 	auto A = content_factory(TestPaths::private_data() / "dolby_aurora.vob")[0];
 	auto B = content_factory(TestPaths::private_data() / "big_buck_bunny_trailer_480p.mov")[0];
-	auto film = new_test_film2("no_use_video_test2", { A, B }, &cl);
+	auto film = new_test_film("no_use_video_test2", { A, B }, &cl);
 	A->set_position (film, dcpomatic::DCPTime());
 	B->set_position (film, dcpomatic::DCPTime());
 	A->video->set_use (false);
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test2)
 /** Make two DCPs and make a VF with the audio from one and the video from another */
 BOOST_AUTO_TEST_CASE (no_use_video_test3)
 {
-	auto ov_a = new_test_film2 ("no_use_video_test3_ov_a");
+	auto ov_a = new_test_film("no_use_video_test3_ov_a");
 	auto ov_a_pic = content_factory("test/data/flat_red.png")[0];
 	BOOST_REQUIRE (ov_a_pic);
 	auto ov_a_snd = content_factory("test/data/sine_16_48_220_10.wav")[0];
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test3)
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (ov_a);
 
-	auto ov_b = new_test_film2("no_use_video_test3_ov_b");
+	auto ov_b = new_test_film("no_use_video_test3_ov_b");
 	auto ov_b_pic = content_factory("test/data/flat_green.png")[0];
 	BOOST_REQUIRE (ov_b_pic);
 	auto ov_b_snd = content_factory("test/data/sine_16_48_880_10.wav")[0];
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (no_use_video_test3)
 	BOOST_REQUIRE (!wait_for_jobs());
 	make_and_verify_dcp (ov_b);
 
-	auto vf = new_test_film2 ("no_use_video_test3_vf");
+	auto vf = new_test_film("no_use_video_test3_vf");
 	auto A = make_shared<DCPContent>(ov_a->dir(ov_a->dcp_name()));
 	auto B = make_shared<DCPContent>(ov_b->dir(ov_b->dcp_name()));
 	vf->examine_and_add_content (A);
diff --git a/test/optimise_stills_test.cc b/test/optimise_stills_test.cc
index 5bf94c0a5..c0049507d 100644
--- a/test/optimise_stills_test.cc
+++ b/test/optimise_stills_test.cc
@@ -75,7 +75,7 @@ check (string name, int check_full, int check_repeat)
 BOOST_AUTO_TEST_CASE (optimise_stills_test1)
 {
 	auto content = content_factory("test/data/flat_red.png")[0];
-	auto film = new_test_film2("optimise_stills_test1", { content });
+	auto film = new_test_film("optimise_stills_test1", { content });
 	LogSwitcher ls (film->log());
 	make_and_verify_dcp (film);
 
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (optimise_stills_test1)
 BOOST_AUTO_TEST_CASE (optimise_stills_test2)
 {
 	auto content = content_factory("test/data/flat_red.png")[0];
-	auto film = new_test_film2("optimise_stills_test2", { content });
+	auto film = new_test_film("optimise_stills_test2", { content });
 	LogSwitcher ls (film->log());
 	content->video->set_frame_type (VideoFrameType::THREE_D_LEFT_RIGHT);
 	film->set_three_d (true);
diff --git a/test/overlap_video_test.cc b/test/overlap_video_test.cc
index 638f606d3..01d7a9fcb 100644
--- a/test/overlap_video_test.cc
+++ b/test/overlap_video_test.cc
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE (overlap_video_test1)
 	auto A = content_factory("test/data/flat_red.png")[0];
 	auto B = content_factory("test/data/flat_green.png")[0];
 	auto C = content_factory("test/data/flat_blue.png")[0];
-	auto film = new_test_film2("overlap_video_test1", { A, B, C });
+	auto film = new_test_film("overlap_video_test1", { A, B, C });
 	film->set_sequence (false);
 
 	auto const fps = 24;
diff --git a/test/player_test.cc b/test/player_test.cc
index f86b13a94..cac5dffe9 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -79,7 +79,7 @@ accumulate (shared_ptr<AudioBuffers> audio, DCPTime)
 BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 {
 	auto c = std::make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("player_silence_padding_test", { c });
+	auto film = new_test_film("player_silence_padding_test", { c });
 	film->set_audio_channels (6);
 
 	accumulated = std::make_shared<AudioBuffers>(film->audio_channels(), 0);
@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE (player_black_fill_test)
 {
 	auto contentA = std::make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
 	auto contentB = std::make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
-	auto film = new_test_film2("black_fill_test", { contentA, contentB });
+	auto film = new_test_film("black_fill_test", { contentA, contentB });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("FTR"));
 	film->set_sequence (false);
 
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE (player_subframe_test)
 {
 	auto A = content_factory("test/data/flat_red.png")[0];
 	auto B = content_factory("test/data/awkward_length.wav")[0];
-	auto film = new_test_film2("reels_test7", { A, B });
+	auto film = new_test_film("reels_test7", { A, B });
 	film->set_video_frame_rate (24);
 	A->video->set_length (3 * 24);
 
@@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
 {
 	auto c = std::make_shared<FFmpegContent>("test/data/test.mp4");
 	auto s = std::make_shared<StringTextFileContent>("test/data/subrip.srt");
-	auto film = new_test_film2("ffmpeg_transcoder_basic_test_subs", { c, s });
+	auto film = new_test_film("ffmpeg_transcoder_basic_test_subs", { c, s });
 	film->set_audio_channels (6);
 
 	Player player(film, Image::Alignment::COMPACT);
@@ -271,7 +271,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 /** Test a bug when trimmed content follows other content */
 BOOST_AUTO_TEST_CASE (player_trim_test)
 {
-       auto film = new_test_film2 ("player_trim_test");
+       auto film = new_test_film("player_trim_test");
        auto A = content_factory("test/data/flat_red.png")[0];
        film->examine_and_add_content (A);
        BOOST_REQUIRE (!wait_for_jobs ());
@@ -310,7 +310,7 @@ store (list<Sub>* out, PlayerText text, TextType type, optional<DCPTextTrack> tr
 /** Test ignoring both video and audio */
 BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 {
-	auto film = new_test_film2 ("player_ignore_video_and_audio_test");
+	auto film = new_test_film("player_ignore_video_and_audio_test");
 	auto ff = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
 	film->examine_and_add_content (ff);
 	auto text = content_factory("test/data/subrip.srt")[0];
@@ -334,7 +334,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 /** Trigger a crash due to the assertion failure in Player::emit_audio */
 BOOST_AUTO_TEST_CASE (player_trim_crash)
 {
-	auto film = new_test_film2 ("player_trim_crash");
+	auto film = new_test_film("player_trim_crash");
 	auto boon = content_factory(TestPaths::private_data() / "boon_telly.mkv")[0];
 	film->examine_and_add_content (boon);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -365,7 +365,7 @@ BOOST_AUTO_TEST_CASE (player_silence_crash)
 	Cleanup cl;
 
 	auto sine = content_factory("test/data/impulse_train.wav")[0];
-	auto film = new_test_film2("player_silence_crash", { sine }, &cl);
+	auto film = new_test_film("player_silence_crash", { sine }, &cl);
 	sine->set_video_frame_rate(film, 23.976);
 	make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA});
 
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE (player_silence_crash)
 /** Test a crash when processing a 3D DCP */
 BOOST_AUTO_TEST_CASE (player_3d_test_1)
 {
-	auto film = new_test_film2 ("player_3d_test_1a");
+	auto film = new_test_film("player_3d_test_1a");
 	auto left = content_factory("test/data/flat_red.png")[0];
 	film->examine_and_add_content (left);
 	auto right = content_factory("test/data/flat_blue.png")[0];
@@ -392,7 +392,7 @@ BOOST_AUTO_TEST_CASE (player_3d_test_1)
 	make_and_verify_dcp (film);
 
 	auto dcp = std::make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2 ("player_3d_test_1b", {dcp});
+	auto film2 = new_test_film("player_3d_test_1b", {dcp});
 
 	film2->set_three_d (true);
 	make_and_verify_dcp (film2);
@@ -404,7 +404,7 @@ BOOST_AUTO_TEST_CASE (player_3d_test_2)
 {
 	auto left = content_factory("test/data/flat_red.png")[0];
 	auto right = content_factory("test/data/flat_blue.png")[0];
-	auto film = new_test_film2 ("player_3d_test_2a", {left, right});
+	auto film = new_test_film("player_3d_test_2a", {left, right});
 
 	left->video->set_frame_type (VideoFrameType::THREE_D_LEFT);
 	left->set_position (film, DCPTime());
@@ -415,7 +415,7 @@ BOOST_AUTO_TEST_CASE (player_3d_test_2)
 	make_and_verify_dcp (film);
 
 	auto dcp = std::make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2 ("player_3d_test_2b", {dcp});
+	auto film2 = new_test_film("player_3d_test_2b", {dcp});
 
 	make_and_verify_dcp (film2);
 }
@@ -428,14 +428,14 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash)
 {
 	/* 25fps DCP with some audio */
 	auto content1 = content_factory("test/data/flat_red.png")[0];
-	auto film1 = new_test_film2 ("player_silence_at_end_crash_1", {content1});
+	auto film1 = new_test_film("player_silence_at_end_crash_1", {content1});
 	content1->video->set_length (25);
 	film1->set_video_frame_rate (25);
 	make_and_verify_dcp (film1);
 
 	/* Make another project importing this DCP */
 	auto content2 = std::make_shared<DCPContent>(film1->dir(film1->dcp_name()));
-	auto film2 = new_test_film2 ("player_silence_at_end_crash_2", {content2});
+	auto film2 = new_test_film("player_silence_at_end_crash_2", {content2});
 
 	/* and importing just the video MXF on its own at the end */
 	optional<boost::filesystem::path> video;
@@ -459,7 +459,7 @@ BOOST_AUTO_TEST_CASE (player_silence_at_end_crash)
 BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error)
 {
 	auto content = content_factory("test/data/flat_red.png")[0];
-	auto film = new_test_film2 ("encrypted_dcp_with_no_kdm_gives_no_butler_error", { content });
+	auto film = new_test_film("encrypted_dcp_with_no_kdm_gives_no_butler_error", { content });
 	int constexpr length = 24 * 25;
 	content->video->set_length(length);
 	film->set_encrypted (true);
@@ -470,7 +470,7 @@ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error)
 		});
 
 	auto content2 = std::make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2 ("encrypted_dcp_with_no_kdm_gives_no_butler_error2", { content2 });
+	auto film2 = new_test_film("encrypted_dcp_with_no_kdm_gives_no_butler_error2", { content2 });
 
 	Player player(film, Image::Alignment::COMPACT);
 	Butler butler(film2, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED);
@@ -505,7 +505,7 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly)
 
 	auto subs1 = content_factory(paths[0])[0];
 	auto subs2 = content_factory(paths[1])[0];
-	auto film = new_test_film2("interleaved_subtitle_are_emitted_correctly", { subs1, subs2 });
+	auto film = new_test_film("interleaved_subtitle_are_emitted_correctly", { subs1, subs2 });
 	film->set_sequence(false);
 	subs1->set_position(film, DCPTime());
 	subs2->set_position(film, DCPTime());
@@ -532,7 +532,7 @@ BOOST_AUTO_TEST_CASE(multiple_sound_files_bug)
 	auto B = content_factory(TestPaths::private_data() / "kook" / "2.wav").front();
 	auto C = content_factory(TestPaths::private_data() / "kook" / "3.wav").front();
 
-	auto film = new_test_film2("multiple_sound_files_bug", { A, B, C }, &cl);
+	auto film = new_test_film("multiple_sound_files_bug", { A, B, C }, &cl);
 	film->set_audio_channels(16);
 	C->set_position(film, DCPTime(3840000));
 
@@ -548,7 +548,7 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13)
 {
 	auto A = content_factory("test/data/sine_16_48_440_10.wav").front();
 	auto B = content_factory("test/data/sine_16_44.1_440_10.wav").front();
-	auto film = new_test_film2("trimmed_sound_mix_bug_13", { A, B });
+	auto film = new_test_film("trimmed_sound_mix_bug_13", { A, B });
 	film->set_audio_channels(16);
 
 	A->set_position(film, DCPTime());
@@ -566,7 +566,7 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13_frame_rate_change)
 {
 	auto A = content_factory("test/data/sine_16_48_440_10.wav").front();
 	auto B = content_factory("test/data/sine_16_44.1_440_10.wav").front();
-	auto film = new_test_film2("trimmed_sound_mix_bug_13_frame_rate_change", { A, B });
+	auto film = new_test_film("trimmed_sound_mix_bug_13_frame_rate_change", { A, B });
 
 	A->set_position(film, DCPTime());
 	A->audio->set_gain(-12);
@@ -588,7 +588,7 @@ BOOST_AUTO_TEST_CASE(two_d_in_three_d_duplicates)
 {
 	auto A = content_factory("test/data/flat_red.png").front();
 	auto B = content_factory("test/data/flat_green.png").front();
-	auto film = new_test_film2("two_d_in_three_d_duplicates", { A, B });
+	auto film = new_test_film("two_d_in_three_d_duplicates", { A, B });
 
 	film->set_three_d(true);
 	B->video->set_frame_type(VideoFrameType::THREE_D_LEFT_RIGHT);
@@ -642,7 +642,7 @@ BOOST_AUTO_TEST_CASE(three_d_in_two_d_chooses_left)
 	auto right = content_factory("test/data/flat_green.png").front();
 	auto mono = content_factory("test/data/flat_blue.png").front();
 
-	auto film = new_test_film2("three_d_in_two_d_chooses_left", { left, right, mono });
+	auto film = new_test_film("three_d_in_two_d_chooses_left", { left, right, mono });
 
 	left->video->set_frame_type(VideoFrameType::THREE_D_LEFT);
 	left->set_position(film, dcpomatic::DCPTime());
@@ -689,7 +689,7 @@ BOOST_AUTO_TEST_CASE(three_d_in_two_d_chooses_left)
 BOOST_AUTO_TEST_CASE(check_seek_with_no_video)
 {
 	auto content = content_factory(TestPaths::private_data() / "Fight.Club.1999.720p.BRRip.x264-x0r.srt")[0];
-	auto film = new_test_film2("check_seek_with_no_video", { content });
+	auto film = new_test_film("check_seek_with_no_video", { content });
 	auto player = std::make_shared<Player>(film, film->playlist());
 
 	boost::signals2::signal<void (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime)> Video;
@@ -717,7 +717,7 @@ BOOST_AUTO_TEST_CASE(check_seek_with_no_video)
 BOOST_AUTO_TEST_CASE(unmapped_audio_does_not_raise_buffer_error)
 {
 	auto content = content_factory(TestPaths::private_data() / "arrietty_JP-EN.mkv")[0];
-	auto film = new_test_film2("unmapped_audio_does_not_raise_buffer_error", { content });
+	auto film = new_test_film("unmapped_audio_does_not_raise_buffer_error", { content });
 
 	content->audio->set_mapping(AudioMapping(6 * 2, MAX_DCP_AUDIO_CHANNELS));
 
diff --git a/test/playlist_test.cc b/test/playlist_test.cc
index e2b9f3ff8..e279e9cc8 100644
--- a/test/playlist_test.cc
+++ b/test/playlist_test.cc
@@ -39,7 +39,7 @@ setup(vector<shared_ptr<Content>>& content, vector<dcpomatic::DCPTime>& position
 		content.push_back(content_factory("test/data/flat_red.png")[0]);
 	}
 
-	auto film = new_test_film2("playlist_move_later_test", content);
+	auto film = new_test_film("playlist_move_later_test", content);
 
 	for (auto i: content) {
 		positions.push_back(i->position());
diff --git a/test/pulldown_detect_test.cc b/test/pulldown_detect_test.cc
index 432bdf26f..9830d12cd 100644
--- a/test/pulldown_detect_test.cc
+++ b/test/pulldown_detect_test.cc
@@ -29,7 +29,7 @@
 BOOST_AUTO_TEST_CASE (pulldown_detect_test1)
 {
 	auto content = content_factory(TestPaths::private_data() / "greatbrain.mkv");
-	auto film = new_test_film2("pulldown_detect_test1", content);
+	auto film = new_test_film("pulldown_detect_test1", content);
 
 	BOOST_REQUIRE(static_cast<bool>(content[0]->video_frame_rate()));
 	BOOST_CHECK_CLOSE(content[0]->video_frame_rate().get(), 23.976, 0.1);
diff --git a/test/recover_test.cc b/test/recover_test.cc
index 25b37190e..ba06fcde9 100644
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -59,7 +59,7 @@ note (dcp::NoteType t, string n)
 BOOST_AUTO_TEST_CASE (recover_test_2d)
 {
 	auto content = make_shared<FFmpegContent>("test/data/count300bd24.m2ts");
-	auto film = new_test_film2("recover_test_2d", { content });
+	auto film = new_test_film("recover_test_2d", { content });
 	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 
 	make_and_verify_dcp (
@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
 {
 	auto content = make_shared<ImageContent>("test/data/3d_test");
 	content->video->set_frame_type (VideoFrameType::THREE_D_LEFT_RIGHT);
-	auto film = new_test_film2("recover_test_3d", { content });
+	auto film = new_test_film("recover_test_3d", { content });
 	film->set_three_d (true);
 	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
 BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on("recover_test_3d"))
 {
 	auto content = make_shared<FFmpegContent>("test/data/count300bd24.m2ts");
-	auto film = new_test_film2("recover_test_2d_encrypted", { content });
+	auto film = new_test_film("recover_test_2d_encrypted", { content });
 	film->set_encrypted (true);
 	film->_key = dcp::Key("eafcb91c9f5472edf01f3a2404c57258");
 	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
diff --git a/test/reel_writer_test.cc b/test/reel_writer_test.cc
index 9a756bd46..411de9b1f 100644
--- a/test/reel_writer_test.cc
+++ b/test/reel_writer_test.cc
@@ -56,7 +56,7 @@ static bool equal(J2KFrameInfo a, shared_ptr<InfoFileHandle> file, Frame frame,
 
 BOOST_AUTO_TEST_CASE (write_frame_info_test)
 {
-	auto film = new_test_film2 ("write_frame_info_test");
+	auto film = new_test_film("write_frame_info_test");
 	dcpomatic::DCPTimePeriod const period (dcpomatic::DCPTime(0), dcpomatic::DCPTime(96000));
 	ReelWriter writer(film, period, shared_ptr<Job>(), 0, 1, false, "foo");
 
@@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE (reel_reuse_video_test)
 	/* Make a DCP */
 	auto video = content_factory("test/data/flat_red.png")[0];
 	auto audio = content_factory("test/data/white.wav")[0];
-	auto film = new_test_film2 ("reel_reuse_video_test", { video, audio });
+	auto film = new_test_film("reel_reuse_video_test", { video, audio });
 	make_and_verify_dcp (film);
 
 	/* Find main picture and sound asset IDs */
diff --git a/test/reels_test.cc b/test/reels_test.cc
index 31888ecaf..7ba01b8a9 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (reels_test1)
 {
 	auto A = make_shared<FFmpegContent>("test/data/test.mp4");
 	auto B = make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("reels_test1", { A, B });
+	auto film = new_test_film("reels_test1", { A, B });
 	BOOST_CHECK_EQUAL (A->full_length(film).get(), 288000);
 
 	film->set_reel_type (ReelType::SINGLE);
@@ -110,7 +110,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	auto r = make_shared<ImageContent>("test/data/flat_red.png");
 	auto g = make_shared<ImageContent>("test/data/flat_green.png");
 	auto b = make_shared<ImageContent>("test/data/flat_blue.png");
-	auto film = new_test_film2("reels_test2", { r, g, b });
+	auto film = new_test_film("reels_test2", { r, g, b });
 	r->video->set_length(24);
 	g->video->set_length(24);
 	b->video->set_length(24);
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	check_dcp ("test/data/reels_test2", film->dir (film->dcp_name()));
 
 	auto c = make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2 ("reels_test2b", {c});
+	auto film2 = new_test_film("reels_test2b", {c});
 	film2->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	film2->set_audio_channels(16);
 
@@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE (reels_test3)
 {
 	auto dcp = make_shared<DCPContent>("test/data/reels_test2");
 	auto sub = make_shared<StringTextFileContent>("test/data/subrip.srt");
-	auto film = new_test_film2 ("reels_test3", {dcp, sub});
+	auto film = new_test_film("reels_test3", {dcp, sub});
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
 	auto reels = film->reels();
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE (reels_test3)
  */
 BOOST_AUTO_TEST_CASE (reels_test4)
 {
-	auto film = new_test_film2 ("reels_test4");
+	auto film = new_test_film("reels_test4");
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	film->set_interop (false);
 
@@ -231,7 +231,7 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 {
 	auto dcp = make_shared<DCPContent>("test/data/reels_test4");
 	dcp->check_font_ids();
-	auto film = new_test_film2 ("reels_test5", {dcp});
+	auto film = new_test_film("reels_test5", {dcp});
 	film->set_sequence (false);
 
 	/* Set to 2123 but it will be rounded up to the next frame (4000) */
@@ -285,7 +285,7 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 BOOST_AUTO_TEST_CASE (reels_test6)
 {
 	auto A = make_shared<FFmpegContent>("test/data/test2.mp4");
-	auto film = new_test_film2 ("reels_test6", {A});
+	auto film = new_test_film("reels_test6", {A});
 
 	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 	film->set_reel_type (ReelType::BY_LENGTH);
@@ -311,7 +311,7 @@ BOOST_AUTO_TEST_CASE (reels_test7)
 {
 	auto A = content_factory("test/data/flat_red.png")[0];
 	auto B = content_factory("test/data/awkward_length.wav")[0];
-	auto film = new_test_film2 ("reels_test7", { A, B });
+	auto film = new_test_film("reels_test7", { A, B });
 	film->set_video_frame_rate (24);
 	A->video->set_length (2 * 24);
 
@@ -328,7 +328,7 @@ BOOST_AUTO_TEST_CASE (reels_test7)
 BOOST_AUTO_TEST_CASE (reels_test8)
 {
 	auto A = make_shared<FFmpegContent>("test/data/test2.mp4");
-	auto film = new_test_film2 ("reels_test8", {A});
+	auto film = new_test_film("reels_test8", {A});
 
 	A->set_trim_end (ContentTime::from_seconds (1));
 	make_and_verify_dcp (film);
@@ -339,13 +339,13 @@ BOOST_AUTO_TEST_CASE (reels_test8)
 BOOST_AUTO_TEST_CASE (reels_test9)
 {
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto film = new_test_film2("reels_test9a", {A});
+	auto film = new_test_film("reels_test9a", {A});
 	A->video->set_length(5 * 24);
 	film->set_video_frame_rate(24);
 	make_and_verify_dcp (film);
 
 	auto B = make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml")[0]});
+	auto film2 = new_test_film("reels_test9b", {B, content_factory("test/data/dcp_sub4.xml")[0]});
 	B->set_reference_video(true);
 	B->set_reference_audio(true);
 	film2->set_reel_type(ReelType::BY_VIDEO_CONTENT);
@@ -370,7 +370,7 @@ BOOST_AUTO_TEST_CASE (reels_test10)
 	/* Make the OV */
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
 	auto B = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto ov = new_test_film2("reels_test10_ov", {A, B});
+	auto ov = new_test_film("reels_test10_ov", {A, B});
 	A->video->set_length (5 * 24);
 	B->video->set_length (5 * 24);
 
@@ -380,7 +380,7 @@ BOOST_AUTO_TEST_CASE (reels_test10)
 
 	/* Now try to make the VF; this used to fail */
 	auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
-	auto vf = new_test_film2("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt")[0]});
+	auto vf = new_test_film("reels_test10_vf", {ov_dcp, content_factory("test/data/15s.srt")[0]});
 	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	ov_dcp->set_reference_video (true);
 	ov_dcp->set_reference_audio (true);
@@ -403,7 +403,7 @@ BOOST_AUTO_TEST_CASE (reels_test10)
 BOOST_AUTO_TEST_CASE (reels_test11)
 {
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto film = new_test_film2 ("reels_test11", {A});
+	auto film = new_test_film("reels_test11", {A});
 	film->set_video_frame_rate (24);
 	A->video->set_length (240);
 	A->set_video_frame_rate(film, 24);
@@ -429,7 +429,7 @@ BOOST_AUTO_TEST_CASE (reels_test12)
 {
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
 	auto B = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto film = new_test_film2 ("reels_test12", {A, B});
+	auto film = new_test_film("reels_test12", {A, B});
 	film->set_video_frame_rate (24);
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	film->set_sequence (false);
@@ -482,7 +482,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1)
 {
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
 	auto B = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto film = new_test_film2 ("reels_should_not_be_short1", {A, B});
+	auto film = new_test_film("reels_should_not_be_short1", {A, B});
 	film->set_video_frame_rate (24);
 
 	A->video->set_length (23);
@@ -507,7 +507,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2)
 {
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
 	auto B = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto film = new_test_film2 ("reels_should_not_be_short2", {A, B});
+	auto film = new_test_film("reels_should_not_be_short2", {A, B});
 	film->set_video_frame_rate (24);
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
@@ -532,7 +532,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2)
 BOOST_AUTO_TEST_CASE (reels_should_not_be_short3)
 {
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto film = new_test_film2 ("reels_should_not_be_short3", {A});
+	auto film = new_test_film("reels_should_not_be_short3", {A});
 	film->set_video_frame_rate (24);
 	film->set_reel_type (ReelType::BY_LENGTH);
 	film->set_reel_length (1024 * 1024 * 10);
@@ -555,7 +555,7 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short4)
 {
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
 	auto B = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto film = new_test_film2 ("reels_should_not_be_short4", {A, B});
+	auto film = new_test_film("reels_should_not_be_short4", {A, B});
 	film->set_video_frame_rate (24);
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
@@ -587,7 +587,7 @@ BOOST_AUTO_TEST_CASE (repeated_dcp_into_reels)
 {
 	/* Make a 20s DCP */
 	auto A = make_shared<FFmpegContent>("test/data/flat_red.png");
-	auto film1 = new_test_film2("repeated_dcp_into_reels1", { A });
+	auto film1 = new_test_film("repeated_dcp_into_reels1", { A });
 	auto constexpr frame_rate = 24;
 	auto constexpr length_in_seconds = 20;
 	auto constexpr total_frames = frame_rate * length_in_seconds;
@@ -609,7 +609,7 @@ BOOST_AUTO_TEST_CASE (repeated_dcp_into_reels)
 		 make_shared<DCPContent>(film1->dir(film1->dcp_name(false)))
 	};
 
-	auto film2 = new_test_film2("repeated_dcp_into_reels2", { original_dcp[0], original_dcp[1], original_dcp[2], original_dcp[3] });
+	auto film2 = new_test_film("repeated_dcp_into_reels2", { original_dcp[0], original_dcp[1], original_dcp[2], original_dcp[3] });
 	film2->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	film2->set_video_frame_rate(frame_rate);
 	film2->set_sequence(false);
diff --git a/test/remake_id_test.cc b/test/remake_id_test.cc
index 816a43feb..a919fa12a 100644
--- a/test/remake_id_test.cc
+++ b/test/remake_id_test.cc
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test1)
 {
 	/* Make a DCP */
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2 ("remake_id_test1_1", content);
+	auto film = new_test_film("remake_id_test1_1", content);
 	make_and_verify_dcp (film);
 
 	/* Copy the video file */
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 {
 	/* Make a DCP */
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2 ("remake_id_test2_1", content);
+	auto film = new_test_film("remake_id_test2_1", content);
 	film->set_encrypted (true);
 	make_and_verify_dcp (film);
 
@@ -93,7 +93,7 @@ BOOST_AUTO_TEST_CASE (remake_id_test2)
 
 	/* Import the DCP into a new film */
 	auto dcp_content = make_shared<DCPContent>(film->dir(film->dcp_name()));
-	auto film2 = new_test_film2("remake_id_test2_2", { dcp_content });
+	auto film2 = new_test_film("remake_id_test2_2", { dcp_content });
 	dcp_content->add_kdm(kdm);
 	JobManager::instance()->add(make_shared<ExamineContentJob>(film2, dcp_content));
 	BOOST_REQUIRE(!wait_for_jobs());
diff --git a/test/remake_video_test.cc b/test/remake_video_test.cc
index 2afe90b63..5ad9f1a5e 100644
--- a/test/remake_video_test.cc
+++ b/test/remake_video_test.cc
@@ -41,7 +41,7 @@ using std::vector;
 BOOST_AUTO_TEST_CASE(remake_video_after_yub_rgb_matrix_changed)
 {
 	auto content = content_factory("test/data/rgb_grey_testcard.mp4")[0];
-	auto film = new_test_film2("remake_video_after_yub_rgb_matrix_changed", { content });
+	auto film = new_test_film("remake_video_after_yub_rgb_matrix_changed", { content });
 
 	auto conversion = content->video->colour_conversion();
 	BOOST_REQUIRE(static_cast<bool>(conversion));
diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 70d38c1eb..49e41bff3 100644
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -35,7 +35,7 @@ using std::dynamic_pointer_cast;
  */
 BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
 {
-	auto film = new_test_film2 ("remake_with_subtitle_test");
+	auto film = new_test_film("remake_with_subtitle_test");
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv")[0]);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
diff --git a/test/repeat_frame_test.cc b/test/repeat_frame_test.cc
index 0d0f38616..3baed100d 100644
--- a/test/repeat_frame_test.cc
+++ b/test/repeat_frame_test.cc
@@ -43,7 +43,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE (repeat_frame_test)
 {
 	auto c = make_shared<FFmpegContent>("test/data/red_24.mp4");
-	auto film = new_test_film2 ("repeat_frame_test", {c});
+	auto film = new_test_film("repeat_frame_test", {c});
 	film->set_interop (false);
 	c->video->set_custom_ratio (1.85);
 
diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index d2e2b4665..4148126cf 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (required_disk_space_test)
 {
 	auto content_a = content_factory("test/data/flat_blue.png")[0];
 	auto content_b = make_shared<DCPContent>("test/data/burnt_subtitle_test_dcp");
-	auto film = new_test_film2("required_disk_space_test", { content_a, content_b });
+	auto film = new_test_film("required_disk_space_test", { content_a, content_b });
 	film->set_video_bit_rate(VideoEncoding::JPEG2000, 100000000);
 	film->set_audio_channels(8);
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
diff --git a/test/scaling_test.cc b/test/scaling_test.cc
index a1ccfb843..69e81cc69 100644
--- a/test/scaling_test.cc
+++ b/test/scaling_test.cc
@@ -74,7 +74,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<Content> content
 BOOST_AUTO_TEST_CASE (scaling_test)
 {
 	auto imc = make_shared<ImageContent>("test/data/simple_testcard_640x480.png");
-	auto film = new_test_film2("scaling_test", { imc });
+	auto film = new_test_film("scaling_test", { imc });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("FTR"));
 	imc->video->set_length (1);
 
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (scaling_test)
 BOOST_AUTO_TEST_CASE(assertion_failure_when_scaling)
 {
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2("assertion_failure_when_scaling", content);
+	auto film = new_test_film("assertion_failure_when_scaling", content);
 
 	content[0]->video->set_custom_size(dcp::Size{3996, 2180});
 	film->set_resolution(Resolution::FOUR_K);
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index 86db117c6..a927510fb 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -50,7 +50,7 @@ static void
 test_silence_padding(int channels, dcp::Standard standard)
 {
 	string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
-	auto film = new_test_film2 (
+	auto film = new_test_film(
 		film_name,
 		{
 			make_shared<FFmpegContent>("test/data/flat_red.png"),
@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE (silence_padding_test2)
 	Cleanup cl;
 
 	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "cars.mov");
-	auto film = new_test_film2 ("silence_padding_test2", { content }, &cl);
+	auto film = new_test_film("silence_padding_test2", { content }, &cl);
 
 	film->set_video_frame_rate (24);
 	content->set_trim_start(film, dcpomatic::ContentTime(4003));
diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index f72a1532a..6eafd064f 100644
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -43,7 +43,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE (skip_frame_test)
 {
 	auto c = make_shared<FFmpegContent>("test/data/count300bd48.m2ts");
-	auto film = new_test_film2("skip_frame_test", { c });
+	auto film = new_test_film("skip_frame_test", { c });
 
 	film->set_video_frame_rate (24);
 	make_and_verify_dcp (film);
diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index ce4ac3f6c..031749a8c 100644
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -50,7 +50,7 @@ using namespace dcpomatic;
 BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 {
 	auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
-	auto film = new_test_film2("srt_subtitle_test", { content });
+	auto film = new_test_film("srt_subtitle_test", { content });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film->set_name("frobozz");
 	film->set_audio_channels(16);
@@ -75,7 +75,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test)
 BOOST_AUTO_TEST_CASE (srt_subtitle_test2)
 {
 	auto content = make_shared<StringTextFileContent> ("test/data/subrip2.srt");
-	auto film = new_test_film2("srt_subtitle_test2", { content });
+	auto film = new_test_film("srt_subtitle_test2", { content });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film->set_name("frobozz");
 	film->set_audio_channels (6);
@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 	Cleanup cl;
 
 	auto content = make_shared<StringTextFileContent>(TestPaths::private_data() / "Ankoemmling_short.srt");
-	auto film = new_test_film2 ("srt_subtitle_test3", { content }, &cl);
+	auto film = new_test_film("srt_subtitle_test3", { content }, &cl);
 
 	film->set_name ("frobozz");
 	film->set_interop (true);
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test3)
 BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 {
 	auto content = make_shared<StringTextFileContent>("test/data/subrip2.srt");
-	auto film = new_test_film2("srt_subtitle_test4", { content });
+	auto film = new_test_film("srt_subtitle_test4", { content });
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film->set_name("frobozz");
 	content->only_text()->set_use (true);
@@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 /** Check the subtitle XML when there are two subtitle files in the project */
 BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 {
-	auto film = new_test_film2("srt_subtitle_test5");
+	auto film = new_test_film("srt_subtitle_test5");
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film->set_name("frobozz");
 	film->set_interop (true);
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE (srt_subtitle_test5)
 BOOST_AUTO_TEST_CASE (srt_subtitle_test6)
 {
 	auto content = make_shared<StringTextFileContent>("test/data/frames.srt");
-	auto film = new_test_film2 ("srt_subtitle_test6", {content});
+	auto film = new_test_film("srt_subtitle_test6", {content});
 	film->set_interop (false);
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
@@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_entity)
 	srt.close();
 
 	auto content = make_shared<StringTextFileContent>("build/test/srt_subtitle_entity.srt");
-	auto film = new_test_film2("srt_subtitle_entity", { content });
+	auto film = new_test_film("srt_subtitle_entity", { content });
 	film->set_interop(false);
 	content->only_text()->set_use(true);
 	content->only_text()->set_burn(false);
@@ -256,7 +256,7 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_control_code)
 	srt.close();
 
 	auto content = make_shared<StringTextFileContent>("build/test/srt_subtitle_control_code.srt");
-	auto film = new_test_film2("srt_subtitle_control_code", { content });
+	auto film = new_test_film("srt_subtitle_control_code", { content });
 	film->set_interop(false);
 	content->only_text()->set_use(true);
 	content->only_text()->set_burn(false);
@@ -279,7 +279,7 @@ BOOST_AUTO_TEST_CASE(srt_subtitle_control_code)
 BOOST_AUTO_TEST_CASE (srt_subtitle_test4)
 {
 	shared_ptr<StringTextFile> content (new StringTextFile("test/data/subrip.srt"));
-	shared_ptr<Film> film = new_test_film2("subrip_render_test", { content });
+	shared_ptr<Film> film = new_test_film("subrip_render_test", { content });
 	content->examine (shared_ptr<Job> (), true);
 	BOOST_CHECK_EQUAL (content->full_length(), DCPTime::from_seconds ((3 * 60) + 56.471));
 
diff --git a/test/ssa_subtitle_test.cc b/test/ssa_subtitle_test.cc
index 2565fc035..ffd374d45 100644
--- a/test/ssa_subtitle_test.cc
+++ b/test/ssa_subtitle_test.cc
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (ssa_subtitle_test1)
 {
 	Cleanup cl;
 
-	auto film = new_test_film2 ("ssa_subtitle_test1", {}, &cl);
+	auto film = new_test_film("ssa_subtitle_test1", {}, &cl);
 
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name ("frobozz");
diff --git a/test/subtitle_charset_test.cc b/test/subtitle_charset_test.cc
index 84f249c65..f4324a646 100644
--- a/test/subtitle_charset_test.cc
+++ b/test/subtitle_charset_test.cc
@@ -35,7 +35,7 @@ using std::dynamic_pointer_cast;
 BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
 {
 	auto content = content_factory(TestPaths::private_data() / "PADDINGTON soustitresVFdef.srt");
-	auto film = new_test_film2 ("subtitle_charset_test1", content);
+	auto film = new_test_film("subtitle_charset_test1", content);
 }
 
 
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE (subtitle_charset_test1)
 BOOST_AUTO_TEST_CASE (subtitle_charset_test2)
 {
 	auto content = content_factory("test/data/osx.srt");
-	auto film = new_test_film2 ("subtitle_charset_test2", content);
+	auto film = new_test_film("subtitle_charset_test2", content);
 	auto ts = dynamic_pointer_cast<StringTextFileContent>(content[0]);
 	BOOST_REQUIRE (ts);
 	/* Make sure we got the subtitle data from the file */
diff --git a/test/subtitle_font_id_change_test.cc b/test/subtitle_font_id_change_test.cc
index 5d4ba60e8..17d732772 100644
--- a/test/subtitle_font_id_change_test.cc
+++ b/test/subtitle_font_id_change_test.cc
@@ -40,7 +40,7 @@ using std::string;
 
 BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test1)
 {
-	auto film = new_test_film2("subtitle_font_id_change_test1");
+	auto film = new_test_film("subtitle_font_id_change_test1");
 	boost::filesystem::remove(film->file("metadata.xml"));
 	boost::filesystem::copy_file("test/data/subtitle_font_id_change_test1.xml", film->file("metadata.xml"));
 	film->read_metadata();
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test1)
 
 BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test2)
 {
-	auto film = new_test_film2("subtitle_font_id_change_test2");
+	auto film = new_test_film("subtitle_font_id_change_test2");
 	boost::filesystem::remove(film->file("metadata.xml"));
 	boost::filesystem::copy_file("test/data/subtitle_font_id_change_test2.xml", film->file("metadata.xml"));
 	{
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test3)
 {
 	Cleanup cl;
 
-	auto film = new_test_film2("subtitle_font_id_change_test3", {}, &cl);
+	auto film = new_test_film("subtitle_font_id_change_test3", {}, &cl);
 	boost::filesystem::remove(film->file("metadata.xml"));
 	boost::filesystem::copy_file("test/data/subtitle_font_id_change_test3.xml", film->file("metadata.xml"));
 	{
@@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE(subtitle_font_id_change_test4)
 {
 	Cleanup cl;
 
-	auto film = new_test_film2("subtitle_font_id_change_test4", {}, &cl);
+	auto film = new_test_film("subtitle_font_id_change_test4", {}, &cl);
 	boost::filesystem::remove(film->file("metadata.xml"));
 	boost::filesystem::copy_file("test/data/subtitle_font_id_change_test4.xml", film->file("metadata.xml"));
 
diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index bc09a9cf1..1a4672cfe 100644
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -41,7 +41,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE(full_dcp_subtitle_font_id_test)
 {
 	auto dcp = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV");
-	auto film = new_test_film2("full_dcp_subtitle_font_id_test", { dcp });
+	auto film = new_test_film("full_dcp_subtitle_font_id_test", { dcp });
 
 	auto content = film->content();
 	BOOST_REQUIRE_EQUAL(content.size(), 1U);
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(full_dcp_subtitle_font_id_test)
 BOOST_AUTO_TEST_CASE(dcp_subtitle_font_id_test)
 {
 	auto subs = content_factory(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV" / "8b48f6ae-c74b-4b80-b994-a8236bbbad74_sub.mxf");
-	auto film = new_test_film2("dcp_subtitle_font_id_test", subs);
+	auto film = new_test_film("dcp_subtitle_font_id_test", subs);
 
 	auto content = film->content();
 	BOOST_REQUIRE_EQUAL(content.size(), 1U);
@@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(dcp_subtitle_font_id_test)
 BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_interop_dcp)
 {
 	auto dcp = make_shared<DCPContent>("test/data/Iopsubs_FTR-1_F_XX-XX_MOS_2K_20220710_IOP_OV");
-	auto film = new_test_film2("make_dcp_with_subs_from_interop_dcp", { dcp });
+	auto film = new_test_film("make_dcp_with_subs_from_interop_dcp", { dcp });
 	dcp->text.front()->set_use(true);
 	make_and_verify_dcp(
 		film,
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_smpte_dcp)
 	Cleanup cl;
 
 	auto dcp = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV");
-	auto film = new_test_film2("make_dcp_with_subs_from_smpte_dcp", { dcp }, &cl);
+	auto film = new_test_film("make_dcp_with_subs_from_smpte_dcp", { dcp }, &cl);
 	dcp->text.front()->set_use(true);
 	make_and_verify_dcp(film);
 
@@ -105,7 +105,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_smpte_dcp)
 BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_mkv)
 {
 	auto subs = content_factory(TestPaths::private_data() / "clapperboard_with_subs.mkv");
-	auto film = new_test_film2("make_dcp_with_subs_from_mkv", subs);
+	auto film = new_test_film("make_dcp_with_subs_from_mkv", subs);
 	subs[0]->text.front()->set_use(true);
 	subs[0]->text.front()->set_language(dcp::LanguageTag("en"));
 	make_and_verify_dcp(film, { dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K });
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_from_mkv)
 BOOST_AUTO_TEST_CASE(make_dcp_with_subs_without_font_tag)
 {
 	auto subs = content_factory("test/data/no_font.xml");
-	auto film = new_test_film2("make_dcp_with_subs_without_font_tag", { subs });
+	auto film = new_test_film("make_dcp_with_subs_without_font_tag", { subs });
 	subs[0]->text.front()->set_use(true);
 	subs[0]->text.front()->set_language(dcp::LanguageTag("de"));
 	make_and_verify_dcp(
@@ -139,7 +139,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_in_dcp_without_font_tag)
 {
 	/* Make a DCP with some subs in */
 	auto source_subs = content_factory("test/data/short.srt");
-	auto source = new_test_film2("make_dcp_with_subs_in_dcp_without_font_tag_source", { source_subs });
+	auto source = new_test_film("make_dcp_with_subs_in_dcp_without_font_tag_source", { source_subs });
 	source->set_interop(true);
 	source_subs[0]->only_text()->set_language(dcp::LanguageTag("de"));
 	make_and_verify_dcp(
@@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_in_dcp_without_font_tag)
 
 	/* Now make a project which imports that DCP and makes another DCP from it */
 	auto dcp_content = make_shared<DCPContent>(source->dir(source->dcp_name()));
-	auto film = new_test_film2("make_dcp_with_subs_without_font_tag", { dcp_content });
+	auto film = new_test_film("make_dcp_with_subs_without_font_tag", { dcp_content });
 	BOOST_REQUIRE(!dcp_content->text.empty());
 	dcp_content->text.front()->set_use(true);
 	make_and_verify_dcp(
@@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE(filler_subtitle_reels_have_load_font_tags)
 	auto video1 = content_factory("test/data/flat_red.png")[0];
 	auto video2 = content_factory("test/data/flat_red.png")[0];
 
-	auto film = new_test_film2(name, { video1, video2, subs });
+	auto film = new_test_film(name, { video1, video2, subs });
 	film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 
 	make_and_verify_dcp(
@@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(subtitle_with_no_font_test)
 	auto video2 = content_factory("test/data/flat_red.png")[0];
 	auto subs = content_factory("test/data/short.srt")[0];
 
-	auto bad_film = new_test_film2(name_base + "_bad", { video1, video2, subs });
+	auto bad_film = new_test_film(name_base + "_bad", { video1, video2, subs });
 	bad_film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	video2->set_position(bad_film, video1->end(bad_film));
 	subs->set_position(bad_film, video1->end(bad_film));
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE(subtitle_with_no_font_test)
 	BOOST_REQUIRE_EQUAL(check_subs->subtitles().size(), 1U);
 	BOOST_CHECK(!std::dynamic_pointer_cast<const dcp::SubtitleString>(check_subs->subtitles()[0])->font().has_value());
 
-	auto check_film = new_test_film2(name_base + "_check", { make_shared<DCPContent>(bad_film->dir(bad_film->dcp_name())) });
+	auto check_film = new_test_film(name_base + "_check", { make_shared<DCPContent>(bad_film->dir(bad_film->dcp_name())) });
 	make_and_verify_dcp(check_film);
 }
 
@@ -266,14 +266,14 @@ BOOST_AUTO_TEST_CASE(subtitle_with_no_font_test)
 BOOST_AUTO_TEST_CASE(load_dcp_with_empty_font_id_test)
 {
 	auto dcp = std::make_shared<DCPContent>(TestPaths::private_data() / "kr_vf");
-	auto film = new_test_film2("load_dcp_with_empty_font_id_test", { dcp });
+	auto film = new_test_film("load_dcp_with_empty_font_id_test", { dcp });
 }
 
 
 BOOST_AUTO_TEST_CASE(use_first_loadfont_as_default)
 {
 	auto dcp = std::make_shared<DCPContent>("test/data/use_default_font");
-	auto film = new_test_film2("use_first_loadfont_as_default", { dcp });
+	auto film = new_test_film("use_first_loadfont_as_default", { dcp });
 	dcp->only_text()->set_use(true);
 	dcp->only_text()->set_language(dcp::LanguageTag("de"));
 	make_and_verify_dcp(
@@ -297,7 +297,7 @@ BOOST_AUTO_TEST_CASE(use_first_loadfont_as_default)
 BOOST_AUTO_TEST_CASE(no_error_with_ccap_that_mentions_no_font)
 {
 	auto dcp = make_shared<DCPContent>("test/data/ccap_only");
-	auto film = new_test_film2("no_error_with_ccap_that_mentions_no_font", { dcp });
+	auto film = new_test_film("no_error_with_ccap_that_mentions_no_font", { dcp });
 	auto player = Player(film, film->playlist());
 	while (!player.pass()) {}
 }
diff --git a/test/subtitle_language_test.cc b/test/subtitle_language_test.cc
index 6ae0647e9..a1a45eb42 100644
--- a/test/subtitle_language_test.cc
+++ b/test/subtitle_language_test.cc
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE (subtitle_language_interop_test)
 {
 	string const name = "subtitle_language_interop_test";
 	auto fr = content_factory("test/data/frames.srt");
-	auto film = new_test_film2 (name, fr);
+	auto film = new_test_film(name, fr);
 
 	fr[0]->only_text()->set_language(dcp::LanguageTag("fr"));
 	film->set_interop (true);
@@ -68,7 +68,7 @@ BOOST_AUTO_TEST_CASE (subtitle_language_smpte_test)
 {
 	string const name = "subtitle_language_smpte_test";
 	auto fr = content_factory("test/data/frames.srt");
-	auto film = new_test_film2 (name, fr);
+	auto film = new_test_film(name, fr);
 
 	fr[0]->only_text()->set_language(dcp::LanguageTag("fr"));
 	film->set_interop (false);
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(subtitle_language_in_cpl_test)
 	auto subs = content_factory("test/data/frames.srt")[0];
 	auto video1 = content_factory("test/data/flat_red.png")[0];
 	auto video2 = content_factory("test/data/flat_red.png")[0];
-	auto film = new_test_film2(boost::unit_test::framework::current_test_unit().full_name(), { subs, video1, video2 });
+	auto film = new_test_film(boost::unit_test::framework::current_test_unit().full_name(), { subs, video1, video2 });
 	video2->set_position(film, dcpomatic::DCPTime::from_seconds(5));
 	film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	subs->only_text()->set_language(dcp::LanguageTag("fr"));
diff --git a/test/subtitle_position_test.cc b/test/subtitle_position_test.cc
index d9dd0c61a..9c71b0d70 100644
--- a/test/subtitle_position_test.cc
+++ b/test/subtitle_position_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE(srt_correctly_placed_in_interop)
 {
 	string const name = "srt_in_interop_position_test";
 	auto fr = content_factory("test/data/short.srt");
-	auto film = new_test_film2(name, fr);
+	auto film = new_test_film(name, fr);
 	fr[0]->only_text()->set_language(dcp::LanguageTag("de"));
 
 	film->set_interop(true);
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(srt_correctly_placed_in_smpte)
 {
 	string const name = "srt_in_smpte_position_test";
 	auto fr = content_factory("test/data/short.srt");
-	auto film = new_test_film2(name, fr);
+	auto film = new_test_film(name, fr);
 
 	fr[0]->text[0]->set_language(dcp::LanguageTag("en"));
 	film->set_interop(false);
@@ -114,7 +114,7 @@ vpos_test(dcp::VAlign reference, float position, dcp::SubtitleStandard from, dcp
 
 	auto name = String::compose("vpos_test_%1_%2", standard, valign_to_string(reference));
 	auto in = content_factory(String::compose("test/data/%1.xml", name));
-	auto film = new_test_film2(name, in);
+	auto film = new_test_film(name, in);
 
 	film->set_interop(to == dcp::Standard::INTEROP);
 
diff --git a/test/subtitle_reel_number_test.cc b/test/subtitle_reel_number_test.cc
index fcc2f40b0..caff70778 100644
--- a/test/subtitle_reel_number_test.cc
+++ b/test/subtitle_reel_number_test.cc
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_number_test)
 	Cleanup cl;
 
 	auto content = make_shared<StringTextFileContent>("test/data/subrip5.srt");
-	auto film = new_test_film2("subtitle_reel_number_test", { content }, &cl);
+	auto film = new_test_film("subtitle_reel_number_test", { content }, &cl);
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
 	content->only_text()->set_language(dcp::LanguageTag("de"));
diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index 147f5c523..8a1a8bece 100644
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -43,7 +43,7 @@ using boost::optional;
 /* Check that timings are done correctly for multi-reel DCPs with PNG subs */
 BOOST_AUTO_TEST_CASE (subtitle_reel_test)
 {
-	auto film = new_test_film2 ("subtitle_reel_test");
+	auto film = new_test_film("subtitle_reel_test");
 	film->set_interop (true);
 	auto red_a = make_shared<ImageContent>("test/data/flat_red.png");
 	auto red_b = make_shared<ImageContent>("test/data/flat_red.png");
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
  */
 BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
 {
-	auto film = new_test_film2 ("subtitle_in_all_reels_test");
+	auto film = new_test_film("subtitle_in_all_reels_test");
 	film->set_interop (false);
 	film->set_sequence (false);
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
  */
 BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
 {
-	auto film = new_test_film2 ("closed_captions_in_all_reels_test");
+	auto film = new_test_film("closed_captions_in_all_reels_test");
 	film->set_interop (false);
 	film->set_sequence (false);
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
@@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
 
 BOOST_AUTO_TEST_CASE (subtitles_split_at_reel_boundaries)
 {
-	auto film = new_test_film2 ("subtitles_split_at_reel_boundaries");
+	auto film = new_test_film("subtitles_split_at_reel_boundaries");
 	film->set_interop (true);
 
 	film->set_sequence (false);
diff --git a/test/subtitle_timing_test.cc b/test/subtitle_timing_test.cc
index 710a95282..2e6b319cb 100644
--- a/test/subtitle_timing_test.cc
+++ b/test/subtitle_timing_test.cc
@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change)
 	auto sub = content_factory("test/data/hour.srt")[0];
 	sub->text.front()->set_language(dcp::LanguageTag("en"));
 
-	auto film = new_test_film2(name, { picture, sub }, &cl);
+	auto film = new_test_film(name, { picture, sub }, &cl);
 	film->set_video_bit_rate(VideoEncoding::JPEG2000, 10000000);
 	picture->set_video_frame_rate(film, content_frame_rate);
 	auto const dcp_frame_rate = film->video_frame_rate();
@@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE(dvb_subtitles_replace_the_last)
 	 */
 	auto content = content_factory(TestPaths::private_data() / "roh.mkv");
 	BOOST_REQUIRE(!content.empty());
-	auto film = new_test_film2("dvb_subtitles_replace_the_last", { content[0] });
+	auto film = new_test_film("dvb_subtitles_replace_the_last", { content[0] });
 
 	FFmpegDecoder decoder(film, dynamic_pointer_cast<FFmpegContent>(content[0]), false);
 	BOOST_REQUIRE(!decoder.text.empty());
diff --git a/test/subtitle_trim_test.cc b/test/subtitle_trim_test.cc
index b9eccbb6f..752d14d9b 100644
--- a/test/subtitle_trim_test.cc
+++ b/test/subtitle_trim_test.cc
@@ -32,7 +32,7 @@ using std::make_shared;
 BOOST_AUTO_TEST_CASE (subtitle_trim_test1)
 {
 	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub5.xml");
-	auto film = new_test_film2 ("subtitle_trim_test1", {content});
+	auto film = new_test_film("subtitle_trim_test1", {content});
 
 	content->set_trim_end (dcpomatic::ContentTime::from_seconds(2));
 	film->write_metadata ();
diff --git a/test/template_test.cc b/test/template_test.cc
index 6af7751cb..b3d8150db 100644
--- a/test/template_test.cc
+++ b/test/template_test.cc
@@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE(template_wrong_channel_counts)
 
 	Config::override_path = "test/data";
 
-	auto film = new_test_film2("template_wrong_channel_counts", {});
+	auto film = new_test_film("template_wrong_channel_counts", {});
 	film->use_template("Bug");
 
 	auto mono = content_factory("test/data/C.wav").front();
diff --git a/test/test.cc b/test/test.cc
index 147aac6bf..4029aeda7 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -203,7 +203,7 @@ test_film_dir (string name)
 
 
 shared_ptr<Film>
-new_test_film2 (string name, vector<shared_ptr<Content>> content, Cleanup* cleanup)
+new_test_film(string name, vector<shared_ptr<Content>> content, Cleanup* cleanup)
 {
 	auto p = test_film_dir (name);
 	if (boost::filesystem::exists (p)) {
diff --git a/test/test.h b/test/test.h
index c4e6460cc..f63f942b6 100644
--- a/test/test.h
+++ b/test/test.h
@@ -58,7 +58,7 @@ private:
 
 
 extern bool wait_for_jobs ();
-extern std::shared_ptr<Film> new_test_film2 (std::string, std::vector<std::shared_ptr<Content>> content = {}, Cleanup* cleanup = nullptr);
+extern std::shared_ptr<Film> new_test_film(std::string, std::vector<std::shared_ptr<Content>> content = {}, Cleanup* cleanup = nullptr);
 extern void check_dcp(boost::filesystem::path, boost::filesystem::path, bool sound_can_differ = false);
 extern void check_dcp (boost::filesystem::path, std::shared_ptr<const Film>);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
diff --git a/test/text_entry_point_test.cc b/test/text_entry_point_test.cc
index ce4f6148e..b48111782 100644
--- a/test/text_entry_point_test.cc
+++ b/test/text_entry_point_test.cc
@@ -56,7 +56,7 @@ BOOST_AUTO_TEST_CASE(test_text_entry_point)
 
 	/* Make a film and add the bad DCP, so that the examiner spots the problem */
 	auto dcp_content = make_shared<DCPContent>(path / "dcp");
-	auto film = new_test_film2("test_text_entry_point/film", { dcp_content });
+	auto film = new_test_film("test_text_entry_point/film", { dcp_content });
 	film->write_metadata();
 
 	/* Reload the film to check that the examiner's output is saved and recovered */
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 82cc5dcc8..fda883164 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -57,7 +57,7 @@ using std::shared_ptr;
 BOOST_AUTO_TEST_CASE (threed_test1)
 {
 	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("threed_test1", { c });
+	auto film = new_test_film("threed_test1", { c });
 
 	c->video->set_frame_type (VideoFrameType::THREE_D_LEFT_RIGHT);
 
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (threed_test1)
 BOOST_AUTO_TEST_CASE (threed_test2)
 {
 	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
-	auto film = new_test_film2("threed_test2", { c });
+	auto film = new_test_film("threed_test2", { c });
 	c->video->set_frame_type (VideoFrameType::THREE_D_ALTERNATE);
 
 	film->set_three_d (true);
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE (threed_test2)
  */
 BOOST_AUTO_TEST_CASE (threed_test3)
 {
-	auto film = new_test_film2 ("threed_test3");
+	auto film = new_test_film("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 	/* Try to stop out-of-memory crashes on my laptop */
 	Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 4);
 
-	auto film = new_test_film2 ("threed_test4");
+	auto film = new_test_film("threed_test4");
 	auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "LEFT_TEST_DCP3D4K.mov");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>(TestPaths::private_data() / "RIGHT_TEST_DCP3D4K.mov");
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (threed_test4)
 
 BOOST_AUTO_TEST_CASE (threed_test5)
 {
-	auto film = new_test_film2 ("threed_test5");
+	auto film = new_test_film("threed_test5");
 	auto L = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>(TestPaths::private_data() / "boon_telly.mkv");
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (threed_test5)
 
 BOOST_AUTO_TEST_CASE (threed_test6)
 {
-	auto film = new_test_film2 ("threed_test6");
+	auto film = new_test_film("threed_test6");
 	auto L = make_shared<FFmpegContent>("test/data/3dL.mp4");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/3dR.mp4");
@@ -182,7 +182,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
 {
 	using boost::filesystem::path;
 
-	auto film = new_test_film2 ("threed_test7");
+	auto film = new_test_film("threed_test7");
 	path const content_path = "test/data/flat_red.png";
 	auto c = content_factory(content_path)[0];
 	film->examine_and_add_content (c);
@@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE (threed_test7)
  */
 BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths)
 {
-	auto film = new_test_film2("threed_test3");
+	auto film = new_test_film("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
@@ -246,7 +246,7 @@ BOOST_AUTO_TEST_CASE (threed_test_separate_files_slightly_different_lengths)
  */
 BOOST_AUTO_TEST_CASE (threed_test_separate_files_very_different_lengths)
 {
-	auto film = new_test_film2("threed_test3");
+	auto film = new_test_film("threed_test3");
 	auto L = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (L);
 	auto R = make_shared<FFmpegContent>("test/data/test.mp4");
@@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE (threed_test_separate_files_very_different_lengths)
 
 BOOST_AUTO_TEST_CASE (threed_test_butler_overfill)
 {
-	auto film = new_test_film2("threed_test_butler_overfill");
+	auto film = new_test_film("threed_test_butler_overfill");
 	auto A = make_shared<FFmpegContent>(TestPaths::private_data() / "arrietty_JP-EN.mkv");
 	film->examine_and_add_content(A);
 	auto B = make_shared<FFmpegContent>(TestPaths::private_data() / "arrietty_JP-EN.mkv");
@@ -309,7 +309,7 @@ BOOST_AUTO_TEST_CASE(threed_passthrough_test, * boost::unit_test::depends_on("th
 	BOOST_REQUIRE(input_dcp);
 
 	auto content = make_shared<DCPContent>(*input_dcp);
-	auto film = new_test_film2("threed_passthrough_test", { content });
+	auto film = new_test_film("threed_passthrough_test", { content });
 	film->set_three_d(false);
 
 	make_and_verify_dcp(film);
@@ -343,7 +343,7 @@ BOOST_AUTO_TEST_CASE(threed_test_when_padding_needed)
 	auto left = content_factory("test/data/flat_red.png").front();
 	auto right = content_factory("test/data/flat_red.png").front();
 	auto sound = content_factory("test/data/sine_440.wav").front();
-	auto film = new_test_film2("threed_test_when_padding_needed", { left, right, sound });
+	auto film = new_test_film("threed_test_when_padding_needed", { left, right, sound });
 
 	left->video->set_frame_type(VideoFrameType::THREE_D_LEFT);
 	left->set_position(film, dcpomatic::DCPTime());
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index e638cefa0..0e09ae2c3 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -132,7 +132,7 @@ static string const xml = "<Content>"
 
 BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 {
-	auto film = new_test_film2("ffmpeg_time_calculation_test");
+	auto film = new_test_film("ffmpeg_time_calculation_test");
 
 	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test)
 /** Test Player::dcp_to_content_video */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 {
-	auto film = new_test_film2("player_time_calculation_test1");
+	auto film = new_test_film("player_time_calculation_test1");
 
 	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
@@ -392,7 +392,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 /** Test Player::content_video_to_dcp */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 {
-	auto film = new_test_film2("player_time_calculation_test2");
+	auto film = new_test_film("player_time_calculation_test2");
 
 	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
@@ -568,7 +568,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 /** Test Player::dcp_to_content_audio */
 BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 {
-	auto film = new_test_film2("player_time_calculation_test3");
+	auto film = new_test_film("player_time_calculation_test3");
 
 	auto doc = make_shared<cxml::Document>();
 	doc->read_string (xml);
diff --git a/test/torture_test.cc b/test/torture_test.cc
index e5ce694ce..e2325955b 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -57,7 +57,7 @@ using namespace dcpomatic;
 /** Test start/end trim and positioning of some audio content */
 BOOST_AUTO_TEST_CASE (torture_test1)
 {
-	auto film = new_test_film2 ("torture_test1");
+	auto film = new_test_film("torture_test1");
 	film->set_sequence (false);
 
 	/* Staircase at an offset of 2000 samples, trimmed both start and end, with a gain of exactly 2 (linear) */
@@ -307,7 +307,7 @@ BOOST_AUTO_TEST_CASE(multi_reel_interop_ccap_test)
 	auto ccap1 = content_factory("test/data/15s.srt").front();
 	auto pic2 = content_factory("test/data/flat_red.png").front();
 	auto ccap2 = content_factory("test/data/15s.srt").front();
-	auto film1 = new_test_film2("multi_reel_interop_ccap_test1", { pic1, ccap1, pic2, ccap2 });
+	auto film1 = new_test_film("multi_reel_interop_ccap_test1", { pic1, ccap1, pic2, ccap2 });
 	film1->set_interop(true);
 	film1->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	ccap1->text[0]->set_type(TextType::CLOSED_CAPTION);
@@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE(multi_reel_interop_ccap_test)
 	make_and_verify_dcp(film1, { dcp::VerificationNote::Code::INVALID_STANDARD, dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING });
 
 	auto reload = make_shared<DCPContent>(film1->dir(film1->dcp_name()));
-	auto film2 = new_test_film2("multi_reel_interop_ccap_test2", { reload });
+	auto film2 = new_test_film("multi_reel_interop_ccap_test2", { reload });
 	for (auto i: reload->text) {
 		i->set_use(true);
 	}
diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 6c2c52ea8..29af9805b 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -69,7 +69,7 @@ write (shared_ptr<AudioBuffers> b, DCPTime)
 BOOST_AUTO_TEST_CASE (upmixer_a_test)
 {
 	auto content = make_shared<FFmpegContent>("test/data/white.wav");
-	auto film = new_test_film2("upmixer_a_test", { content });
+	auto film = new_test_film("upmixer_a_test", { content });
 	film->set_audio_processor (AudioProcessor::from_id("stereo-5.1-upmix-a"));
 
 	SF_INFO info;
diff --git a/test/vf_kdm_test.cc b/test/vf_kdm_test.cc
index 5ab1761d3..3fd8bc327 100644
--- a/test/vf_kdm_test.cc
+++ b/test/vf_kdm_test.cc
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	/* Make an encrypted DCP from test.mp4 */
 
 	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
-	auto A = new_test_film2("vf_kdm_test_ov", { c });
+	auto A = new_test_film("vf_kdm_test_ov", { c });
 	A->set_interop (true);
 	A->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	A->set_encrypted (true);
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	auto d = make_shared<DCPContent>("build/test/vf_kdm_test_ov/" + A->dcp_name());
 	d->add_kdm(A_kdm);
 
-	auto B = new_test_film2("vf_kdm_test_vf", { d });
+	auto B = new_test_film("vf_kdm_test_vf", { d });
 	B->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	B->set_interop(true);
 
@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	auto e = make_shared<DCPContent>("build/test/vf_kdm_test_vf/" + B->dcp_name());
 	e->add_ov ("build/test/vf_kdm_test_ov/" + A->dcp_name());
 	e->add_kdm(B_kdm);
-	auto C = new_test_film2("vf_kdm_test_check", { e });
+	auto C = new_test_film("vf_kdm_test_check", { e });
 	C->set_interop (true);
 	C->set_audio_channels(6);
 	C->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 5fb1b9861..72c5ececf 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -66,7 +66,7 @@ using namespace dcpomatic;
 BOOST_AUTO_TEST_CASE (vf_test1)
 {
 	auto dcp = make_shared<DCPContent>("test/data/reels_test2");
-	auto film = new_test_film2("vf_test1", { dcp });
+	auto film = new_test_film("vf_test1", { dcp });
 
 	/* Multi-reel DCP can't be referenced if we are using a single reel for the project */
 	film->set_reel_type (ReelType::SINGLE);
@@ -110,14 +110,14 @@ BOOST_AUTO_TEST_CASE (vf_test2)
 	/* Make the OV */
 	auto video = content_factory("test/data/flat_red.png")[0];
 	auto audio = content_factory("test/data/white.wav")[0];
-	auto ov = new_test_film2("vf_test2_ov", { video, audio });
+	auto ov = new_test_film("vf_test2_ov", { video, audio });
 	video->video->set_length (24 * 5);
 	make_and_verify_dcp (ov);
 
 	/* Make the VF */
 	auto dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
 	auto sub = content_factory("test/data/subrip4.srt")[0];
-	auto vf = new_test_film2("vf_test2_vf", { dcp, sub });
+	auto vf = new_test_film("vf_test2_vf", { dcp, sub });
 	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	dcp->set_reference_video (true);
 	dcp->set_reference_audio (true);
@@ -162,13 +162,13 @@ BOOST_AUTO_TEST_CASE (vf_test3)
 	/* Make the OV */
 	auto video = content_factory("test/data/flat_red.png")[0];
 	auto audio = content_factory("test/data/white.wav")[0];
-	auto ov = new_test_film2("vf_test3_ov", { video, audio });
+	auto ov = new_test_film("vf_test3_ov", { video, audio });
 	video->video->set_length (24 * 5);
 	make_and_verify_dcp (ov);
 
 	/* Make the VF */
 	auto dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
-	auto vf = new_test_film2("vf_test3_vf", { dcp });
+	auto vf = new_test_film("vf_test3_vf", { dcp });
 	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	dcp->set_trim_start(vf, ContentTime::from_seconds (1));
 	dcp->set_trim_end (ContentTime::from_seconds (1));
@@ -195,13 +195,13 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 	/* Make the OV */
 	auto video = content_factory("test/data/flat_red.png")[0];
 	auto audio = content_factory("test/data/white.wav")[0];
-	auto ov = new_test_film2("vf_test4_ov", { video, audio });
+	auto ov = new_test_film("vf_test4_ov", { video, audio });
 	video->video->set_length (24 * 5);
 	make_and_verify_dcp (ov);
 
 	/* Make the VF */
 	auto dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
-	auto vf = new_test_film2("vf_test4_vf", { dcp });
+	auto vf = new_test_film("vf_test4_vf", { dcp });
 	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	vf->set_sequence (false);
 	dcp->set_position(vf, DCPTime::from_seconds(10));
@@ -238,7 +238,7 @@ BOOST_AUTO_TEST_CASE (vf_test4)
 BOOST_AUTO_TEST_CASE (vf_test5)
 {
 	/* Make the OV */
-	auto ov = new_test_film2("vf_test5_ov");
+	auto ov = new_test_film("vf_test5_ov");
 	ov->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	for (int i = 0; i < 3; ++i) {
 		auto video = content_factory("test/data/flat_red.png")[0];
@@ -252,7 +252,7 @@ BOOST_AUTO_TEST_CASE (vf_test5)
 
 	/* Make the VF */
 	auto dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
-	auto vf = new_test_film2("vf_test5_vf", { dcp });
+	auto vf = new_test_film("vf_test5_vf", { dcp });
 	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	vf->set_sequence (false);
 	dcp->set_reference_video (true);
@@ -280,14 +280,14 @@ BOOST_AUTO_TEST_CASE (vf_test6)
 {
 	/* Make the OV */
 	auto video = content_factory("test/data/flat_red.png")[0];
-	auto ov = new_test_film2("vf_test6_ov", { video });
+	auto ov = new_test_film("vf_test6_ov", { video });
 	ov->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	video->video->set_length (24 * 10);
 	make_and_verify_dcp (ov);
 
 	/* Make the VF */
 	auto dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
-	auto vf = new_test_film2("vf_test6_vf", { dcp });
+	auto vf = new_test_film("vf_test6_vf", { dcp });
 	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	vf->set_sequence (false);
 	dcp->set_reference_video (true);
@@ -313,19 +313,19 @@ BOOST_AUTO_TEST_CASE (vf_test6)
 BOOST_AUTO_TEST_CASE (vf_test7)
 {
 	/* First OV */
-	auto ov1 = new_test_film2 ("vf_test7_ov1", {content_factory("test/data/flat_red.png")[0]});
+	auto ov1 = new_test_film("vf_test7_ov1", {content_factory("test/data/flat_red.png")[0]});
 	ov1->set_video_frame_rate (24);
 	make_and_verify_dcp (ov1);
 
 	/* Second OV */
-	auto ov2 = new_test_film2 ("vf_test7_ov2", {content_factory("test/data/flat_red.png")[0]});
+	auto ov2 = new_test_film("vf_test7_ov2", {content_factory("test/data/flat_red.png")[0]});
 	ov2->set_video_frame_rate (24);
 	make_and_verify_dcp (ov2);
 
 	/* VF */
 	auto ov1_dcp = make_shared<DCPContent>(ov1->dir(ov1->dcp_name()));
 	auto ov2_dcp = make_shared<DCPContent>(ov2->dir(ov2->dcp_name()));
-	auto vf = new_test_film2 ("vf_test7_vf", {ov1_dcp, ov2_dcp});
+	auto vf = new_test_film("vf_test7_vf", {ov1_dcp, ov2_dcp});
 	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	ov1_dcp->set_reference_video (true);
 	ov2_dcp->set_reference_video (true);
@@ -346,14 +346,14 @@ BOOST_AUTO_TEST_CASE (test_vf_with_trimmed_multi_reel_dcp)
 		c->video->set_length(240);
 		ov_content.push_back(c);
 	}
-	auto ov = new_test_film2 ("test_vf_with_trimmed_multi_reel_dcp_ov", ov_content);
+	auto ov = new_test_film("test_vf_with_trimmed_multi_reel_dcp_ov", ov_content);
 	ov->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	make_and_verify_dcp (ov);
 
 	/* Make a VF with a specific arrangement */
 	auto vf_image = content_factory("test/data/flat_red.png")[0];
 	auto vf_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
-	auto vf = new_test_film2 ("test_vf_with_trimmed_multi_reel_dcp_vf", { vf_image, vf_dcp });
+	auto vf = new_test_film("test_vf_with_trimmed_multi_reel_dcp_vf", { vf_image, vf_dcp });
 	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	vf_dcp->set_reference_video(true);
 	vf_dcp->set_reference_audio(true);
@@ -368,7 +368,7 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_subs_when_adding_ccaps)
 {
 	string const name("test_referencing_ov_with_subs_when_adding_ccaps");
 	auto subs = content_factory("test/data/15s.srt");
-	auto ov = new_test_film2(name + "_ov", subs);
+	auto ov = new_test_film(name + "_ov", subs);
 	make_and_verify_dcp(
 		ov,
 		{
@@ -379,7 +379,7 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_subs_when_adding_ccaps)
 
 	auto ccaps = content_factory("test/data/15s.srt")[0];
 	auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
-	auto vf = new_test_film2(name + "_vf", { ov_dcp, ccaps });
+	auto vf = new_test_film(name + "_vf", { ov_dcp, ccaps });
 	ccaps->text[0]->set_type(TextType::CLOSED_CAPTION);
 
 	string why_not;
@@ -392,7 +392,7 @@ BOOST_AUTO_TEST_CASE(test_duplicate_font_id_in_vf)
 {
 	string const name("test_duplicate_font_id_in_vf");
 	auto subs = content_factory("test/data/15s.srt");
-	auto ov = new_test_film2(name + "_ov", subs);
+	auto ov = new_test_film(name + "_ov", subs);
 	make_and_verify_dcp(
 		ov,
 		{
@@ -403,7 +403,7 @@ BOOST_AUTO_TEST_CASE(test_duplicate_font_id_in_vf)
 
 	auto ccaps = content_factory("test/data/15s.srt")[0];
 	auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
-	auto vf = new_test_film2(name + "_vf", { ov_dcp, ccaps });
+	auto vf = new_test_film(name + "_vf", { ov_dcp, ccaps });
 	ov_dcp->set_reference_audio(true);
 	ov_dcp->set_reference_video(true);
 	ov_dcp->text[0]->set_use(true);
@@ -417,7 +417,7 @@ BOOST_AUTO_TEST_CASE(test_duplicate_font_id_in_vf)
 
 	auto vf_dcp = make_shared<DCPContent>(vf->dir(vf->dcp_name(false)));
 
-	auto test = new_test_film2(name + "_test", { vf_dcp });
+	auto test = new_test_film(name + "_test", { vf_dcp });
 	vf_dcp->add_ov(ov->dir(ov->dcp_name(false)));
 	JobManager::instance()->add(make_shared<ExamineContentJob>(test, vf_dcp));
 	BOOST_CHECK(!wait_for_jobs());
@@ -514,7 +514,7 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels)
 BOOST_AUTO_TEST_CASE(ov_subs_in_vf_name)
 {
 	auto subs = content_factory("test/data/short.srt")[0];
-	auto ov = new_test_film2("ov_subs_in_vf_name_ov", { subs });
+	auto ov = new_test_film("ov_subs_in_vf_name_ov", { subs });
 	subs->only_text()->set_language(dcp::LanguageTag("de"));
 	make_and_verify_dcp(
 		ov,
@@ -524,7 +524,7 @@ BOOST_AUTO_TEST_CASE(ov_subs_in_vf_name)
 		});
 
 	auto ov_dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
-	auto vf = new_test_film2("ov_subs_in_vf_name_vf", { ov_dcp });
+	auto vf = new_test_film("ov_subs_in_vf_name_vf", { ov_dcp });
 	vf->set_name("foo");
 	ov_dcp->set_reference_text(TextType::OPEN_SUBTITLE, true);
 	vf->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18);
diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index bb2c1b7fa..69a8af89e 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_video_range_expanded)
 	write_image(grey_image(size, grey_pixel), file);
 
 	auto content = content_factory(file);
-	auto film = new_test_film2 ("ffmpeg_image_video_range_expanded", content);
+	auto film = new_test_film("ffmpeg_image_video_range_expanded", content);
 	content[0]->video->set_range (VideoRange::VIDEO);
 	auto player = make_shared<Player>(film, film->playlist());
 
@@ -310,7 +310,7 @@ static
 shared_ptr<Film>
 movie_V (string name)
 {
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mp4")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
@@ -328,7 +328,7 @@ static
 shared_ptr<Film>
 movie_VoF (string name)
 {
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mp4")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
@@ -347,7 +347,7 @@ static
 shared_ptr<Film>
 movie_F (string name)
 {
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mov")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
@@ -365,7 +365,7 @@ static
 shared_ptr<Film>
 movie_FoV (string name)
 {
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<FFmpegContent>(content_factory("test/data/rgb_grey_testcard.mov")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
@@ -384,7 +384,7 @@ static
 shared_ptr<Film>
 image_F (string name)
 {
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<ImageContent>(content_factory("test/data/rgb_grey_testcard.png")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
@@ -402,7 +402,7 @@ static
 shared_ptr<Film>
 image_FoV (string name)
 {
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	auto content = dynamic_pointer_cast<ImageContent>(content_factory("test/data/rgb_grey_testcard.png")[0]);
 	BOOST_REQUIRE (content);
 	film->examine_and_add_content (content);
@@ -425,7 +425,7 @@ shared_ptr<Film>
 dcp_F (string name)
 {
 	boost::filesystem::path const dcp = "test/data/RgbGreyTestcar_TST-1_F_MOS_2K_20201115_SMPTE_OV";
-	auto film = new_test_film2 (name);
+	auto film = new_test_film(name);
 	auto content = make_shared<DCPContent>(dcp);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index 77891b0c2..df83db41c 100644
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (video_mxf_content_test)
 	auto const ref_mxf = find_file("test/data/scaling_test_185_185", "j2c");
 	auto content = content_factory(ref_mxf);
 
-	auto film = new_test_film2("video_mxf_content_test", content);
+	auto film = new_test_film("video_mxf_content_test", content);
 	make_and_verify_dcp (
 		film,
 		{
diff --git a/test/writer_test.cc b/test/writer_test.cc
index b98e553ed..b4ef93c1d 100644
--- a/test/writer_test.cc
+++ b/test/writer_test.cc
@@ -44,7 +44,7 @@ using std::vector;
 BOOST_AUTO_TEST_CASE (test_write_odd_amount_of_silence)
 {
 	auto content = content_factory("test/data/flat_red.png");
-	auto film = new_test_film2 ("test_write_odd_amount_of_silence", content);
+	auto film = new_test_film("test_write_odd_amount_of_silence", content);
 	content[0]->video->set_length(24);
 	auto writer = make_shared<Writer>(film, shared_ptr<Job>(), "foo");
 
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE (interrupt_writer)
 {
 	Cleanup cl;
 
-	auto film = new_test_film2 ("test_interrupt_writer", {}, &cl);
+	auto film = new_test_film("test_interrupt_writer", {}, &cl);
 
 	auto content = content_factory("test/data/check_image0.png")[0];
 	film->examine_and_add_content (content);
@@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(writer_progress_test)
 	auto picture1 = content_factory("test/data/flat_red.png")[0];
 	auto picture2 = content_factory("test/data/flat_red.png")[0];
 
-	auto film = new_test_film2("writer_progress_test", { picture1, picture2 });
+	auto film = new_test_film("writer_progress_test", { picture1, picture2 });
 	film->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	picture1->video->set_length(240);
 	picture2->video->set_length(240);