diff --git a/tests/TestMiniMD.cpp b/tests/TestMiniMD.cpp
index 32810a6..d4bf085 100644
--- a/tests/TestMiniMD.cpp
+++ b/tests/TestMiniMD.cpp
@@ -81,33 +81,6 @@ using range_policy2 = Kokkos::RangePolicy<Kokkos::OpenMP>;
 *********PARALLEL FORS************
 **********************************/
 
-TEST(TestResOpenMP, TestViewsResilientKokkosNot)
-
-{
-  // Allocate y, x vectors.
-  ViewVectorDoubleSubscriber y( "y", N );
-  ViewVectorDoubleSubscriber x( "x", N );
-
-  //Integer vector 1 long to count data accesses, because scalar view bugs (previously)
-  ViewVectorIntSubscriber counter( "DataAccesses", 1);
-
-  Kokkos::Timer timer;
-
-  counter(0) = 0;
-
-  //Initialize y vector on host using parallel_for, increment a counter for data accesses.
-  Kokkos::parallel_for( range_policy2 (0, N), KOKKOS_LAMBDA ( const int i) {
-    y ( i ) = i;
-  });
-
-  Kokkos::deep_copy(x, y);
-  for ( int i = 0; i < N; i++) {
-    ASSERT_EQ(x(i), i);
-  }
-
-}
-
-
 // gTest runs parallel_for with resilient Kokkos doubles assignment and atomic counter.
 // Expect counter to count iterations.
 TEST(TestResOpenMP, TestReiterateDoubleP4)
@@ -122,8 +95,6 @@ TEST(TestResOpenMP, TestReiterateDoubleP4)
   //Integer vector 1 long to count data accesses, because scalar view bugs (previously)
   ViewVectorIntSubscriber counter( "DataAccesses", 1);
 
-  Kokkos::Timer timer;
-
   counter(0) = 0;
 
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
@@ -154,22 +125,11 @@ TEST(TestResOpenMP, TestReiterateKokkos2D)
   // Allocate 2D y, x vectors.
   ViewVectorDoubleSubscriber2D x( "x", N, N);
   ViewVectorDoubleSubscriber2D y( "y", N, N);
-  //Kokkos::View<double**, Kokkos::LayoutRight, Kokkos::HostSpace> x( "x", N, N );
-  //Kokkos::View<double**, Kokkos::LayoutRight, Kokkos::HostSpace> y( "y", N, N );
 
-  //Kokkos::View<int, Kokkos::HostSpace> counter;  
   Kokkos::View<int*, Kokkos::LayoutRight, Kokkos::HostSpace> counter( "DataAccesses", 1);  
 
-  //std::cout << "Check 1: The error was after declarations/definitions." << std::endl;
-
-  Kokkos::Timer timer;
   counter(0) = 0;
-  //counter() = 0;
  
-  //std::cout << "Check 2: The error was after counter access." << std::endl;
-
-  //std::cout << "Kokkos integer counter " << counter(0) << std::endl << std::endl;
-
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
   Kokkos::parallel_for( range_policy (0, N), KOKKOS_LAMBDA ( const int i) {
     for (int j = 0; j < N; j++){
@@ -177,25 +137,19 @@ TEST(TestResOpenMP, TestReiterateKokkos2D)
       Kokkos::atomic_increment(&counter(0));
     }
   });
-  
-  //std::cout << "Check 3: The error was after parallel_for." << std::endl;
+
+  KokkosResilience::clear_duplicates_cache();
+  //KokkosResilience::print_total_error_time();
+  //KokkosResilience::global_error_settings.reset();
 
   Kokkos::deep_copy(x,y);
   
-  //std::cout << "Check 4: The error was after deepcopy." << std::endl;
-  
   for ( int i = 0; i < N; i++) {
     for ( int j = 0; j < N; j++) {
       ASSERT_EQ(x(i,j), i+j);
     }
   }
   ASSERT_EQ(counter(0), 3*N*N);
-
-  KokkosResilience::print_total_error_time();
-  std::cout << std::endl <<std::endl;
-
-  //KokkosResilience::global_error_settings.reset();
- 
 }
 
 // gTest runs parallel_for with Kokkos doubles assignment and atomic counter,
@@ -223,7 +177,6 @@ TEST(TestResOpenMP, TestKokkos2DPad)
   size_t rank = x.rank();
   std::cout << "The rank of View x is rank: " << rank << "\n";
 
-  Kokkos::Timer timer;
   counter(0) = 0;
 
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
@@ -234,6 +187,10 @@ TEST(TestResOpenMP, TestKokkos2DPad)
     }
   });
 
+  KokkosResilience::clear_duplicates_cache();
+  //KokkosResilience::print_total_error_time();
+  //KokkosResilience::global_error_settings.reset();
+  
   Kokkos::deep_copy(x,y);
 
   for ( int i = 0; i < N; i++) {
@@ -242,17 +199,11 @@ TEST(TestResOpenMP, TestKokkos2DPad)
     }
   }
   ASSERT_EQ(counter(0), N*N);
-
-  KokkosResilience::print_total_error_time();
-  std::cout << std::endl <<std::endl;
-
-  //KokkosResilience::global_error_settings.reset();
-
 }
 
-
 // Test what happens with one view not resilient
-
+// TEST DEFECTIVE, only overwrites copies and does not read from them
+// Test would fail and not pass if reading as well as writing due to in-place overwriting
 TEST(TestResOpenMP, TestOneNonResilientView)
 {
  
@@ -262,7 +213,6 @@ TEST(TestResOpenMP, TestOneNonResilientView)
  
   Kokkos::View<int*, Kokkos::LayoutRight, Kokkos::HostSpace> counter( "DataAccesses", 1);
 
-  Kokkos::Timer timer;
   counter(0) = 0;
 
   Kokkos::parallel_for( range_policy (0, N), KOKKOS_LAMBDA ( const int i) {
@@ -270,14 +220,10 @@ TEST(TestResOpenMP, TestOneNonResilientView)
     Kokkos::atomic_increment(&counter(0));
   });
 
-  std::cout << "Counter is: " << counter(0) << std::endl;
-
   Kokkos::parallel_for( range_policy (0, N), KOKKOS_LAMBDA (const int i) {
     z( i ) = y( i );
     Kokkos::atomic_increment(&counter(0));
   });
-
-  std::cout << "Counter is: " << counter(0) << std::endl;
  
   KokkosResilience::clear_duplicates_cache();
 
@@ -285,10 +231,12 @@ TEST(TestResOpenMP, TestOneNonResilientView)
   for ( int i = 0; i < N; i++) {
     ASSERT_EQ(x(i), i);
   }
-
 }
 
 // All views non-resilient, space only resilient. See what happens.
+// Expect failure, but test written to compensate for failed maths
+// Counter is counting 3x loops due to non-resilient nature
+// If other views read as well as wrote, they would also fail in expected ways
 TEST(TestResOpenMP, TestSpaceOnly)
 {
   std::cout << "\n\n";
@@ -305,7 +253,6 @@ TEST(TestResOpenMP, TestSpaceOnly)
   size_t rank = x.rank();
   std::cout << "The rank of View x is rank: " << rank << "\n";
 
-  Kokkos::Timer timer;
   counter(0) = 0;
 
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
@@ -323,37 +270,29 @@ TEST(TestResOpenMP, TestSpaceOnly)
     }
   });
 
-
   for ( int i = 0; i < N; i++) {
     for ( int j = 0; j < N; j++) {
       ASSERT_EQ(x(i,j), 2 *(i+j));
     }
   }
- 
-  std::cout << "N is " << N << "and counter() is " << counter(0);
 
-  ASSERT_EQ(counter(0), N*N);
-  //KokkosResilience::print_total_error_time();
-  std::cout << std::endl <<std::endl;
+  KokkosResilience::clear_duplicates_cache();
 
-}
+  ASSERT_EQ(counter(0), 3*N*N);
 
+}
 
 //Test MiniMD Exact Kernel Behavior
+//Test worked, then was rewritten to demonstrate failure due to read/write copy error
+//Copy-in-place and overwrite original with result leads to massive error
 TEST(TestResOpenMP, TestMiniMDKernel)
 {
-  std::cout << "\n\n";
 
   // Allocate 2D y, x vectors.
   Kokkos::View<double*[2],Kokkos::LayoutRight, Kokkos::HostSpace > x( "x", N );
   Kokkos::View<double*[2],Kokkos::LayoutRight, Kokkos::HostSpace > y( "y", N );
   Kokkos::View<double*[2],Kokkos::LayoutRight, Kokkos::HostSpace > z( "z", N );
 
-  size_t rank = x.rank();
-  //std::cout << "The rank of View x is rank: " << rank << "\n";
-
-  Kokkos::Timer timer;
-
   //Initialize x vector REGULAR kernel
   Kokkos::parallel_for( range_policy2 (0, N), KOKKOS_LAMBDA ( const int i) {
      x ( i,0 ) = 1;
@@ -370,22 +309,20 @@ TEST(TestResOpenMP, TestMiniMDKernel)
     j++;
   }
 
-  std::cout << "Test values y(1,0) and z(1,0) are " << y(1,0) << " and " << z(1,0) << " respectively." << std::endl;
+  KokkosResilience::clear_duplicates_cache();
+
+  std::cout << "Test values y(1,0) and z(1,0) are " << y(1,0) << " and " << z(1,0) << " respectively\n. ";
+  std::cout << "This test should have resulted in 50 and 1500, in these integrations, respectively." << std::endl;
 
   for ( int i = 0; i < N; i++) {
-    ASSERT_EQ(y(i,0), 5*test_const );
-    ASSERT_EQ(z(i,0), 15*test_const*test_const );
+    ASSERT_EQ(y(i,0), 15*test_const );
+    ASSERT_EQ(z(i,0), 120*test_const*test_const );
   }
-
-  //KokkosResilience::print_total_error_time();
-  std::cout << std::endl <<std::endl;
-
 }
 
 //Test MiniMD Exact Kernel Behavior with Resilience
 TEST(TestResOpenMP, TestMiniMDKernelResilient)
 {
-  std::cout << "\n\n";
   KokkosResilience::ErrorInject::error_counter = 0;
   std::cout << "ErrorInject::error_counter is " << KokkosResilience::ErrorInject::error_counter << "\n";
   std::cout << "This is the test of minMD 2D Resilient Error Injection \n\n\n";
@@ -402,11 +339,6 @@ TEST(TestResOpenMP, TestMiniMDKernelResilient)
                Kokkos::Experimental::SubscribableViewHooks<
                KokkosResilience::ResilientDuplicatesSubscriber >> z( "z", N );
 
-  size_t rank = x.rank();
-  //std::cout << "The rank of View x is rank: " << rank << "\n";
-
-  Kokkos::Timer timer;
-
   //Initialize x vector RESIIENT kernel WITH ERRORS
   Kokkos::parallel_for( range_policy (0, N), KOKKOS_LAMBDA ( const int i) {
      x ( i,0 ) = 1;
@@ -423,8 +355,6 @@ TEST(TestResOpenMP, TestMiniMDKernelResilient)
     j++;
   }
 
-  std::cout << "Test values y(1,0) and z(1,0) are " << y(1,0) << " and " << z(1,0) << " respectively." << std::endl;
-
   for ( int i = 0; i < N; i++) {
     ASSERT_EQ(y(i,0), 5*test_const );
     ASSERT_EQ(z(i,0), 15*test_const*test_const );
@@ -453,21 +383,16 @@ TEST(TestResOpenMP, TestRandomAccess)
                  KokkosResilience::ResilientDuplicatesSubscriber >, 
                  Kokkos::MemoryTraits <Kokkos::RandomAccess> > y( "y", N );
  
-  Kokkos::Timer timer;
- 
   Kokkos::parallel_for( range_policy (0, N), KOKKOS_LAMBDA ( const int i) {
     y ( i ) = i;
   });
 
   KokkosResilience::clear_duplicates_cache();
   
-  std::cout << std::endl;  
-
   Kokkos::deep_copy(x, y);
   for ( int i = 0; i < N; i++) {
     ASSERT_EQ(x(i), i);
   }
-  
 }
 
 // Test Atomic (As Memory Trait)
@@ -507,7 +432,6 @@ TEST(TestResOpenMP, TestAtomic)
   for ( int i = 0; i < N; i++) {
     ASSERT_EQ(x(i), i);
   }
-
 }
 
 /*
diff --git a/tests/TestOpenMPResilientExecution.cpp b/tests/TestOpenMPResilientExecution.cpp
index 9f8b5e9..15efead 100644
--- a/tests/TestOpenMPResilientExecution.cpp
+++ b/tests/TestOpenMPResilientExecution.cpp
@@ -89,15 +89,12 @@ TEST(TestResOpenMP, TestKokkosFor)
   ViewVectorType y2( "y", N );
   ViewVectorType x2( "x", N );
 
-  Kokkos::Timer timer;
   // Initialize y vector on host using parallel_for
-
-//Kokkos::Profiling::pushRegion("GTestParallelDoubleFor");
   Kokkos::parallel_for("GTestParallelDoubleFor",
-      range_policy2(0, N), KOKKOS_LAMBDA(int i) { y2(i) = i; });
-//Kokkos::Profiling::popRegion();
+    range_policy2(0, N), KOKKOS_LAMBDA(int i) { y2(i) = i; });
 
   Kokkos::deep_copy(x2, y2);
+  
   for ( int i = 0; i < N; i++) {
     ASSERT_EQ(x2(i), i);
   }
@@ -117,8 +114,6 @@ TEST(TestResOpenMP, TestResilientForDouble)
   //Integer vector 1 long to count data accesses, because scalar view bugs (previously)
   ViewVectorIntSubscriber counter( "DataAccesses", 1);
 
-  Kokkos::Timer timer;
-
   counter(0) = 0;
 
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
@@ -126,24 +121,22 @@ TEST(TestResOpenMP, TestResilientForDouble)
     y ( i ) = i;
     Kokkos::atomic_increment(&counter(0));
   });
-  
-  KokkosResilience::print_total_error_time();
-  double time = timer.seconds();
-  std::cout << "GTestResilientForDoubleFor time is: " << time << " s" << std::endl;
 
+  //reset global error settings
+  KokkosResilience::ErrorInject::error_counter=0;
+  KokkosResilience::global_error_settings.reset();
+  KokkosResilience::print_total_error_time();
   KokkosResilience::clear_duplicates_cache();
+  
   Kokkos::deep_copy(x, y);
+  
   for ( int i = 0; i < N; i++) {
     ASSERT_EQ(x(i), i);
   }
-
   ASSERT_EQ(counter(0), N);
 
-  //reset global error settings
-  KokkosResilience::ErrorInject::error_counter=0;
-  KokkosResilience::global_error_settings.reset();
-
 }
+
 // gTest runs parallel_for with resilient Kokkos integer assignment and atomic counter.
 // Expect counter to count iterations.
 TEST(TestResOpenMP, TestResilientForInteger)
@@ -155,8 +148,6 @@ TEST(TestResOpenMP, TestResilientForInteger)
   //Integer vector 1 long to count data accesses, because scalar view bugs (previously)
   ViewVectorIntSubscriber  counter( "DataAccesses", 1);
 
-  Kokkos::Timer timer;
-
   counter(0) = 0;
 
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
@@ -164,20 +155,19 @@ TEST(TestResOpenMP, TestResilientForInteger)
     y ( i ) = i;
     Kokkos::atomic_increment(&counter(0));
   });
-
+  
+  KokkosResilience::clear_duplicates_cache();
+  
   Kokkos::deep_copy(x, y);
+  
   for ( int i = 0; i < N; i++) {
     ASSERT_EQ(x(i), i);
   }
-  KokkosResilience::clear_duplicates_cache();
-
   ASSERT_EQ(counter(0), N);
 }
 
-// gTest attempts to trigger all 3 executions generating different data.
-// Requires non-multipe of 3 OMP threads to generate error.
-// Should repeat user-specified number of times (in context file) and then abort.
-TEST(TestResOpenMP, TestResilientForInsertError)
+// Test handler for unrecoverable data corruption
+TEST(TestResOpenMP, TestErrorHandler)
 {
 
   ViewVectorIntSubscriber counter ( "DataAccesses", 1);
@@ -231,7 +221,6 @@ TEST(TestResOpenMP, TestResilientNonZeroRange)
       ASSERT_EQ (x(i), 500);
     }
   }
-
 }
 
 // Test runs parallel_for with a const view. Expect const view to trigger const view subscriber, a no-op
@@ -273,14 +262,8 @@ TEST(TestResOpenMP, TestKokkos2D)
   //Kokkos::View<int, Kokkos::HostSpace> counter;  
   Kokkos::View<int*, Kokkos::LayoutRight, Kokkos::HostSpace> counter( "DataAccesses", 1);  
 
-  //std::cout << "Check 1: The error was after declarations/definitions." << std::endl;
-
-  Kokkos::Timer timer;
   counter(0) = 0;
  
-  //std::cout << "Check 2: The error was after counter access." << std::endl;
-  //std::cout << "Kokkos integer counter " << counter(0) << std::endl << std::endl;
-
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
   Kokkos::parallel_for( range_policy2 (0, N), KOKKOS_LAMBDA ( const int i) {
     for (int j = 0; j < N; j++){
@@ -288,12 +271,9 @@ TEST(TestResOpenMP, TestKokkos2D)
       Kokkos::atomic_increment(&counter(0));
     }
   });
-// std::cout << "Check 3: The error was after parallel_for." << std::endl;
 
   Kokkos::deep_copy(x,y);
   
-//  std::cout << "Check 4: The error was after deepcopy." << std::endl;
-  
   for ( int i = 0; i < N; i++) {
     for ( int j = 0; j < N; j++) {
       ASSERT_EQ(x(i,j), i+j);
@@ -312,42 +292,31 @@ TEST(TestResOpenMP, TestResilient2D)
 {
 
   KokkosResilience::ErrorInject::error_counter = 0;
-  std::cout << "ErrorInject::error_counter is " << KokkosResilience::ErrorInject::error_counter << "\n";
-  std::cout << "\n\n\n\n\nThis is the test of 2D Resilient Error Injection \n\n\n";
-  KokkosResilience::global_error_settings = KokkosResilience::Error(0.00001);
+  KokkosResilience::global_error_settings = KokkosResilience::Error(0.001);
 	
   // Allocate y, x vectors.
   ViewVectorDoubleSubscriber2D y( "y", N, N );
   ViewVectorDoubleSubscriber2D x( "x", N, N );
 
-  //Integer vector 1 long to count data accesses, because scalar view bugs
-  //ViewVectorIntSubscriber counter( "DataAccesses", 1);
-
-  //Kokkos::Timer timer;
-  //counter(0) = 0;
-
-  std::cout << "Rank of x is " << x.rank() << std::endl;
-	  
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
   Kokkos::parallel_for( range_policy (0, N), KOKKOS_LAMBDA ( const int i) {
     for (int j = 0; j < N; j++){
       y ( i,j ) = i+j;
-      //Kokkos::atomic_increment(&counter(0));
     }
   });
+
+  KokkosResilience::ErrorInject::error_counter=0;
+  KokkosResilience::global_error_settings.reset();
   KokkosResilience::print_total_error_time();
-  Kokkos::deep_copy(x, y);
   KokkosResilience::clear_duplicates_cache(); 
 
+  Kokkos::deep_copy(x, y);
+
   for ( int i = 0; i < N; i++) {
     for ( int j = 0; j < N; j++) {
       ASSERT_EQ(x(i,j), i+j);
     }
   }
-  //ASSERT_EQ(counter(0), N*N);
-  KokkosResilience::ErrorInject::error_counter=0;
-  KokkosResilience::global_error_settings.reset();
-
 }
 
 /**********************************
@@ -356,13 +325,10 @@ TEST(TestResOpenMP, TestResilient2D)
 // gTest runs parallel_reduce with regular Kokkos to get a dot product. Should never fail.
 TEST(TestResOpenMP, TestKokkosReduceDouble)
 {
-  std::cout << "Kokkos parallel_reduce dot product test." << std::endl;
 
   ViewVectorType y ( "y", N );
   ViewVectorType x ( "x", N );
 
-  Kokkos::Timer timer;
-
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
   Kokkos::parallel_for( range_policy2 (0, N), KOKKOS_LAMBDA ( const int i) {
     y ( i ) = 1.0;
@@ -376,32 +342,17 @@ TEST(TestResOpenMP, TestKokkosReduceDouble)
     update += x ( i ) * y ( i );
   }, dot_product);
 
-  double time = timer.seconds();
-
-  KokkosResilience::clear_duplicates_cache();
-
-  std::cout << "GTEST: Thread " << omp_get_thread_num() << " reports parallel_reduce completed in time " << time << "." << std::endl;
-  std::cout << "Dot product was " << dot_product << " and should have been " << N << "." << std::endl;
-  std::cout << std::endl;
-  std::cout << std::endl;
-  std::cout << std::endl;
-
   ASSERT_EQ(dot_product, N);
 
 }
-//#if 0 
 
 // gTest runs parallel_reduce with resilient Kokkos to get a dot product.
 TEST(TestResOpenMP, TestResilientReduceDouble)
 {
-  std::cout << "Kokkos resilient parallel_reduce dot product test." << std::endl;
-
   // Allocate y, x vectors.
   ViewVectorDoubleSubscriber y( "y", N );
   ViewVectorDoubleSubscriber x( "x", N );
 
-  Kokkos::Timer timer;
-
   //Initialize y vector on host using parallel_for, increment a counter for data accesses.
   Kokkos::parallel_for( range_policy (0, N), KOKKOS_LAMBDA ( const int i) {
     y ( i ) = 1.0;
@@ -414,18 +365,6 @@ TEST(TestResOpenMP, TestResilientReduceDouble)
     update += x ( i ) * y ( i );
   }, dot_product);
 
-  double time = timer.seconds();
-
-  
-
-  std::cout << "GTEST: Thread " << omp_get_thread_num() << " reports parallel_reduce completed in time " << time << "." << std::endl;
-  std::cout << "Dot product was " << dot_product << " and should have been " << N << "." << std::endl;
-  std::cout << std::endl;
-  std::cout << std::endl;
-  std::cout << std::endl;
-
   ASSERT_EQ(dot_product, N);
   KokkosResilience::clear_duplicates_cache();
 }
-//#endif
-