-extern boost::shared_ptr<dcp::MonoPictureAsset> simple_picture (boost::filesystem::path path, std::string suffix);
-extern boost::shared_ptr<dcp::DCP> make_simple (boost::filesystem::path path, int reels = 1);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_interop_subs (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_smpte_subs (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_interop_ccaps (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::DCP> make_simple_with_smpte_ccaps (boost::filesystem::path path);
-extern boost::shared_ptr<dcp::OpenJPEGImage> black_image ();
-extern boost::shared_ptr<dcp::ReelAsset> black_picture_asset (boost::filesystem::path dir, int frames = 24);
+extern std::shared_ptr<dcp::MonoPictureAsset> simple_picture (
+ boost::filesystem::path path,
+ std::string suffix,
+ int frames = 24,
+ boost::optional<dcp::Key> key = boost::optional<dcp::Key>()
+ );
+extern std::shared_ptr<dcp::SoundAsset> simple_sound (
+ boost::filesystem::path path,
+ std::string suffix,
+ dcp::MXFMetadata mxf_meta,
+ std::string language,
+ int frames = 24,
+ int sample_rate = 48000,
+ boost::optional<dcp::Key> key = boost::optional<dcp::Key>(),
+ int channels = 6
+ );
+extern std::shared_ptr<dcp::Subtitle> simple_subtitle ();
+extern std::shared_ptr<dcp::ReelMarkersAsset> simple_markers (int frames = 24);
+extern std::shared_ptr<dcp::DCP> make_simple (
+ boost::filesystem::path path,
+ int reels = 1,
+ int frames = 24,
+ dcp::Standard = dcp::Standard::SMPTE,
+ boost::optional<dcp::Key> key = boost::optional<dcp::Key>()
+ );
+extern std::shared_ptr<dcp::DCP> make_simple_with_interop_subs (boost::filesystem::path path);
+extern std::shared_ptr<dcp::DCP> make_simple_with_smpte_subs (boost::filesystem::path path);
+extern std::shared_ptr<dcp::DCP> make_simple_with_interop_ccaps (boost::filesystem::path path);
+extern std::shared_ptr<dcp::DCP> make_simple_with_smpte_ccaps (boost::filesystem::path path);
+extern std::shared_ptr<dcp::OpenJPEGImage> black_image (dcp::Size size = dcp::Size(1998, 1080));
+extern std::shared_ptr<dcp::ReelAsset> black_picture_asset (boost::filesystem::path dir, int frames = 24);
+extern boost::filesystem::path find_file (boost::filesystem::path dir, std::string filename_part);