diff --git a/examples/clipping/Clipping.cxx b/examples/clipping/Clipping.cxx
index d1671a97420b713ce1ee22acd889d20c2b46e27e..c123b56b3587b7716e19df7acac11436b4a3895a 100644
--- a/examples/clipping/Clipping.cxx
+++ b/examples/clipping/Clipping.cxx
@@ -9,24 +9,44 @@
 //============================================================================
 #include <vtkm/cont/Initialize.h>
 
-#include <vtkm/cont/testing/MakeTestDataSet.h>
-
+#include <vtkm/io/VTKDataSetReader.h>
 #include <vtkm/io/VTKDataSetWriter.h>
 
 #include <vtkm/filter/ClipWithField.h>
 
+#include <cstdlib>
+#include <iostream>
+
 int main(int argc, char* argv[])
 {
-  vtkm::cont::Initialize(argc, argv, vtkm::cont::InitializeOptions::Strict);
-
-  vtkm::cont::DataSet input = vtkm::cont::testing::MakeTestDataSet().Make3DExplicitDataSetCowNose();
+  vtkm::cont::Initialize(argc, argv);
+
+  if ((argc < 4) || (argc > 5))
+  {
+    std::cerr << "Usage: " << argv[0] << " in_data.vtk field_name clip_value [out_data.vtk]\n\n";
+    std::cerr << "For example, you could use the ucd3d.vtk that comes with the VTK-m source:\n\n";
+    std::cerr << "  " << argv[0]
+              << " <path-to-vtkm-source>/data/data/unstructured/ucd3d.vtk v 0.3\n";
+    return 1;
+  }
+  std::string infilename = argv[1];
+  std::string infield = argv[2];
+  double fieldValue = std::atof(argv[3]);
+  std::string outfilename = "out_data.vtk";
+  if (argc == 5)
+  {
+    outfilename = argv[4];
+  }
+
+  vtkm::io::VTKDataSetReader reader(infilename);
+  vtkm::cont::DataSet input = reader.ReadDataSet();
 
   vtkm::filter::ClipWithField clipFilter;
-  clipFilter.SetActiveField("pointvar");
-  clipFilter.SetClipValue(20.0);
+  clipFilter.SetActiveField(infield);
+  clipFilter.SetClipValue(fieldValue);
   vtkm::cont::DataSet output = clipFilter.Execute(input);
 
-  vtkm::io::VTKDataSetWriter writer("out_data.vtk");
+  vtkm::io::VTKDataSetWriter writer(outfilename);
   writer.WriteDataSet(output);
 
   return 0;
diff --git a/examples/hello_worklet/HelloWorklet.cxx b/examples/hello_worklet/HelloWorklet.cxx
index 92b32033f5a2c902ec95f78263e33b258cda2596..3f103cf48fc1cd8203e7134989bdd4eaf9434bb8 100644
--- a/examples/hello_worklet/HelloWorklet.cxx
+++ b/examples/hello_worklet/HelloWorklet.cxx
@@ -13,14 +13,16 @@
 #include <vtkm/filter/CreateResult.h>
 #include <vtkm/filter/FilterField.h>
 
+#include <vtkm/io/VTKDataSetReader.h>
 #include <vtkm/io/VTKDataSetWriter.h>
 
 #include <vtkm/cont/Initialize.h>
 
-#include <vtkm/cont/testing/MakeTestDataSet.h>
-
 #include <vtkm/VectorAnalysis.h>
 
+#include <cstdlib>
+#include <iostream>
+
 namespace vtkm
 {
 namespace worklet
@@ -81,16 +83,34 @@ public:
 
 int main(int argc, char** argv)
 {
-  vtkm::cont::Initialize(argc, argv, vtkm::cont::InitializeOptions::Strict);
+  vtkm::cont::Initialize(argc, argv);
+
+  if ((argc < 3) || (argc > 4))
+  {
+    std::cerr << "Usage: " << argv[0] << " in_data.vtk field_name [out_data.vtk]\n\n";
+    std::cerr << "For example, you could use the simple_unstructured_bin.vtk that comes with the "
+                 "VTK-m source:\n\n";
+    std::cerr
+      << "  " << argv[0]
+      << " <path-to-vtkm-source>/data/data/unstructured/simple_unstructured_bin.vtk vectors\n";
+    return 1;
+  }
+  std::string infilename = argv[1];
+  std::string infield = argv[2];
+  std::string outfilename = "out_data.vtk";
+  if (argc == 4)
+  {
+    outfilename = argv[3];
+  }
 
-  vtkm::cont::testing::MakeTestDataSet testDataMaker;
-  vtkm::cont::DataSet inputData = testDataMaker.Make3DExplicitDataSetCowNose();
+  vtkm::io::VTKDataSetReader reader(infilename);
+  vtkm::cont::DataSet inputData = reader.ReadDataSet();
 
   vtkm::filter::HelloField helloField;
-  helloField.SetActiveField("point_vectors");
+  helloField.SetActiveField(infield);
   vtkm::cont::DataSet outputData = helloField.Execute(inputData);
 
-  vtkm::io::VTKDataSetWriter writer("out_data.vtk");
+  vtkm::io::VTKDataSetWriter writer(outfilename);
   writer.WriteDataSet(outputData);
 
   return 0;
diff --git a/examples/mesh_quality/MeshQuality.cxx b/examples/mesh_quality/MeshQuality.cxx
index 5df24a7f539c30f853ca7b800081c6c057652512..b60f99e6888001de6847979b461353cfbfc95606 100644
--- a/examples/mesh_quality/MeshQuality.cxx
+++ b/examples/mesh_quality/MeshQuality.cxx
@@ -22,7 +22,6 @@
 #include <vector>
 #include <vtkm/cont/DataSet.h>
 #include <vtkm/cont/DataSetBuilderExplicit.h>
-#include <vtkm/cont/testing/Testing.h>
 #include <vtkm/filter/MeshQuality.h>
 #include <vtkm/io/VTKDataSetReader.h>
 #include <vtkm/io/VTKDataSetWriter.h>
diff --git a/examples/polyline_archimedean_helix/PolyLineArchimedeanHelix.cxx b/examples/polyline_archimedean_helix/PolyLineArchimedeanHelix.cxx
index 96ccd06652a9772b9bc343f58880a34e516dd6f4..59b4b969757cc33e2a688538f14e8813254f363f 100644
--- a/examples/polyline_archimedean_helix/PolyLineArchimedeanHelix.cxx
+++ b/examples/polyline_archimedean_helix/PolyLineArchimedeanHelix.cxx
@@ -10,7 +10,6 @@
 
 #include <complex>
 #include <vtkm/cont/DataSetBuilderExplicit.h>
-#include <vtkm/cont/testing/Testing.h>
 #include <vtkm/io/VTKDataSetWriter.h>
 #include <vtkm/worklet/Tube.h>
 
diff --git a/examples/streamline_mpi/StreamlineMPI.cxx b/examples/streamline_mpi/StreamlineMPI.cxx
index 51a0c79c95b53b376fcbc451bff0f912d8c175cc..2cc2ffe8aca2dc253a2dfa7d76dccb19e286eda6 100644
--- a/examples/streamline_mpi/StreamlineMPI.cxx
+++ b/examples/streamline_mpi/StreamlineMPI.cxx
@@ -65,11 +65,11 @@ void LoadData(std::string& fname, std::vector<vtkm::cont::DataSet>& dataSets, in
     {
       vtkm::cont::DataSet ds;
       std::string vtkFile = dir + "/" + buff;
-      vtkm::io::reader::VTKDataSetReader reader(vtkFile);
+      vtkm::io::VTKDataSetReader reader(vtkFile);
       ds = reader.ReadDataSet();
       auto f = ds.GetField("grad").GetData();
       vtkm::cont::ArrayHandle<vtkm::Vec<double, 3>> fieldArray;
-      fieldArray = f.Cast<vtkm::cont::ArrayHandle<vtkm::Vec<double, 3>>>();
+      f.AsArrayHandle(fieldArray);
       int n = fieldArray.GetNumberOfValues();
       auto portal = fieldArray.WritePortal();
       for (int ii = 0; ii < n; ii++)
@@ -102,11 +102,9 @@ int main(int argc, char** argv)
   vtkm::filter::ParticleAdvection pa;
 
   vtkm::cont::ArrayHandle<vtkm::Particle> seedArray;
-  std::vector<vtkm::Particle> seeds;
-  seeds.push_back(vtkm::Particle(vtkm::Vec3f(.1f, .1f, .9f), 0));
-  seeds.push_back(vtkm::Particle(vtkm::Vec3f(.1f, .6f, .6f), 1));
-  seeds.push_back(vtkm::Particle(vtkm::Vec3f(.1f, .9f, .1f), 2));
-  seedArray = vtkm::cont::make_ArrayHandle(seeds);
+  seedArray = vtkm::cont::make_ArrayHandle({ vtkm::Particle(vtkm::Vec3f(.1f, .1f, .9f), 0),
+                                             vtkm::Particle(vtkm::Vec3f(.1f, .6f, .6f), 1),
+                                             vtkm::Particle(vtkm::Vec3f(.1f, .9f, .1f), 2) });
   pa.SetStepSize(0.001f);
   pa.SetNumberOfSteps(10000);
   pa.SetSeeds(seedArray);
diff --git a/examples/tetrahedra/Tetrahedralize.cxx b/examples/tetrahedra/Tetrahedralize.cxx
index 37174b10bcd473a225bc214620cd84c1c59cb7ce..8fbc0b4ae4e0b7748988db2d963b3b94d6f8fc9b 100644
--- a/examples/tetrahedra/Tetrahedralize.cxx
+++ b/examples/tetrahedra/Tetrahedralize.cxx
@@ -9,23 +9,39 @@
 //============================================================================
 #include <vtkm/cont/Initialize.h>
 
-#include <vtkm/cont/testing/MakeTestDataSet.h>
-
+#include <vtkm/io/VTKDataSetReader.h>
 #include <vtkm/io/VTKDataSetWriter.h>
 
 #include <vtkm/filter/Tetrahedralize.h>
 
+#include <cstdlib>
+#include <iostream>
+
 int main(int argc, char* argv[])
 {
-  vtkm::cont::Initialize(argc, argv, vtkm::cont::InitializeOptions::Strict);
-
-  vtkm::cont::DataSet input =
-    vtkm::cont::testing::MakeTestDataSet().Make3DUniformDataSet3(vtkm::Id3(25, 25, 25));
+  vtkm::cont::Initialize(argc, argv);
+
+  if ((argc < 2) || (argc > 3))
+  {
+    std::cerr << "Usage: " << argv[0] << " in_data.vtk [out_data.vtk]\n\n";
+    std::cerr << "For example, you could use the ucd3d.vtk that comes with the VTK-m source:\n\n";
+    std::cerr << "  " << argv[0] << " <path-to-vtkm-source>/data/data/unstructured/ucd3d.vtk\n";
+    return 1;
+  }
+  std::string infilename = argv[1];
+  std::string outfilename = "out_tets.vtk";
+  if (argc == 3)
+  {
+    outfilename = argv[2];
+  }
+
+  vtkm::io::VTKDataSetReader reader(infilename);
+  vtkm::cont::DataSet input = reader.ReadDataSet();
 
   vtkm::filter::Tetrahedralize tetrahedralizeFilter;
   vtkm::cont::DataSet output = tetrahedralizeFilter.Execute(input);
 
-  vtkm::io::VTKDataSetWriter writer("out_tets.vtk");
+  vtkm::io::VTKDataSetWriter writer(outfilename);
   writer.WriteDataSet(output);
 
   return 0;
diff --git a/examples/tetrahedra/Triangulate.cxx b/examples/tetrahedra/Triangulate.cxx
index 1153a94cc04884d9a9b2e210542986cf68c57374..0818bb65cfca11a7be81c9293c722ad7ab1e4653 100644
--- a/examples/tetrahedra/Triangulate.cxx
+++ b/examples/tetrahedra/Triangulate.cxx
@@ -9,22 +9,39 @@
 //============================================================================
 #include <vtkm/cont/Initialize.h>
 
-#include <vtkm/cont/testing/MakeTestDataSet.h>
-
+#include <vtkm/io/VTKDataSetReader.h>
 #include <vtkm/io/VTKDataSetWriter.h>
 
 #include <vtkm/filter/Triangulate.h>
 
+#include <cstdlib>
+#include <iostream>
+
 int main(int argc, char* argv[])
 {
-  vtkm::cont::Initialize(argc, argv, vtkm::cont::InitializeOptions::Strict);
-
-  vtkm::cont::DataSet input = vtkm::cont::testing::MakeTestDataSet().Make2DUniformDataSet2();
+  vtkm::cont::Initialize(argc, argv);
+
+  if ((argc < 2) || (argc > 3))
+  {
+    std::cerr << "Usage: " << argv[0] << " in_data.vtk [out_data.vtk]\n\n";
+    std::cerr << "For example, you could use the vanc.vtk that comes with the VTK-m source:\n\n";
+    std::cerr << "  " << argv[0] << " <path-to-vtkm-source>/data/data/rectilinear/vanc.vtk\n";
+    return 1;
+  }
+  std::string infilename = argv[1];
+  std::string outfilename = "out_tris.vtk";
+  if (argc == 3)
+  {
+    outfilename = argv[2];
+  }
+
+  vtkm::io::VTKDataSetReader reader(infilename);
+  vtkm::cont::DataSet input = reader.ReadDataSet();
 
   vtkm::filter::Triangulate triangulateFilter;
   vtkm::cont::DataSet output = triangulateFilter.Execute(input);
 
-  vtkm::io::VTKDataSetWriter writer("out_tris.vtk");
+  vtkm::io::VTKDataSetWriter writer(outfilename);
   writer.WriteDataSet(output);
 
   return 0;