diff --git a/src/shared/particle_dynamics/fluid_dynamics/viscous_dynamics.hpp b/src/shared/particle_dynamics/fluid_dynamics/viscous_dynamics.hpp
index cc65c8f7e5..7e8f79cc82 100644
--- a/src/shared/particle_dynamics/fluid_dynamics/viscous_dynamics.hpp
+++ b/src/shared/particle_dynamics/fluid_dynamics/viscous_dynamics.hpp
@@ -37,11 +37,12 @@ void ViscousForce<Inner<>, ViscosityType, KernelCorrectionType>::interaction(siz
     for (size_t n = 0; n != inner_neighborhood.current_size_; ++n)
     {
         size_t index_j = inner_neighborhood.j_[n];
+        const Vecd &e_ij = inner_neighborhood.e_ij_[n];
 
         // viscous force
         Vecd vel_derivative = (vel_[index_i] - vel_[index_j]) /
                               (inner_neighborhood.r_ij_[n] + 0.01 * smoothing_length_);
-        force += (kernel_correction_(index_i) + kernel_correction_(index_j)) *
+        force += e_ij.dot((kernel_correction_(index_i) + kernel_correction_(index_j)) * e_ij) *
                  mu_(index_i, index_j) * vel_derivative *
                  inner_neighborhood.dW_ij_[n] * Vol_[index_j];
     }
@@ -60,11 +61,11 @@ void ViscousForce<Inner<AngularConservative>, ViscosityType, KernelCorrectionTyp
     interaction(size_t index_i, Real dt)
 {
     Vecd force = Vecd::Zero();
-    Neighborhood &inner_neighborhood = inner_configuration_[index_i];
+    const Neighborhood &inner_neighborhood = inner_configuration_[index_i];
     for (size_t n = 0; n != inner_neighborhood.current_size_; ++n)
     {
         size_t index_j = inner_neighborhood.j_[n];
-        Vecd &e_ij = inner_neighborhood.e_ij_[n];
+        const Vecd &e_ij = inner_neighborhood.e_ij_[n];
         Real r_ij = inner_neighborhood.r_ij_[n];
 
         /** The following viscous force is given in Monaghan 2005 (Rep. Prog. Phys.), it seems that
@@ -72,7 +73,7 @@ void ViscousForce<Inner<AngularConservative>, ViscosityType, KernelCorrectionTyp
         Real v_r_ij = (vel_[index_i] - vel_[index_j]).dot(e_ij);
         Real eta_ij = Real(Dimensions + 2) * mu_(index_i, index_j) * v_r_ij /
                       (r_ij + 0.01 * smoothing_length_);
-        force += (kernel_correction_(index_i) + kernel_correction_(index_j)) *
+        force += e_ij.dot((kernel_correction_(index_i) + kernel_correction_(index_j)) * e_ij) *
                  eta_ij * inner_neighborhood.dW_ij_[n] * Vol_[index_j] * e_ij;
     }
 
@@ -94,15 +95,16 @@ void ViscousForce<Contact<Wall>, ViscosityType, KernelCorrectionType>::
     {
         StdLargeVec<Vecd> &vel_ave_k = *(wall_vel_ave_[k]);
         StdLargeVec<Real> &wall_Vol_k = *(wall_Vol_[k]);
-        Neighborhood &contact_neighborhood = (*contact_configuration_[k])[index_i];
+        const Neighborhood &contact_neighborhood = (*contact_configuration_[k])[index_i];
         for (size_t n = 0; n != contact_neighborhood.current_size_; ++n)
         {
             size_t index_j = contact_neighborhood.j_[n];
             Real r_ij = contact_neighborhood.r_ij_[n];
+            const Vecd &e_ij = contact_neighborhood.e_ij_[n];
 
             Vecd vel_derivative = 2.0 * (vel_[index_i] - vel_ave_k[index_j]) /
                                   (r_ij + 0.01 * smoothing_length_);
-            force += 2.0 * kernel_correction_(index_i) * mu_(index_i, index_i) *
+            force += 2.0 * e_ij.dot(kernel_correction_(index_i) * e_ij) * mu_(index_i, index_i) *
                      vel_derivative * contact_neighborhood.dW_ij_[n] * wall_Vol_k[index_j];
         }
     }
@@ -125,18 +127,18 @@ void ViscousForce<Contact<Wall, AngularConservative>, ViscosityType, KernelCorre
     {
         StdLargeVec<Vecd> &vel_ave_k = *(wall_vel_ave_[k]);
         StdLargeVec<Real> &wall_Vol_k = *(wall_Vol_[k]);
-        Neighborhood &contact_neighborhood = (*contact_configuration_[k])[index_i];
+        const Neighborhood &contact_neighborhood = (*contact_configuration_[k])[index_i];
         for (size_t n = 0; n != contact_neighborhood.current_size_; ++n)
         {
             size_t index_j = contact_neighborhood.j_[n];
-            Vecd &e_ij = contact_neighborhood.e_ij_[n];
+            const Vecd &e_ij = contact_neighborhood.e_ij_[n];
             Real r_ij = contact_neighborhood.r_ij_[n];
 
             Real v_r_ij = 2.0 * (vel_[index_i] - vel_ave_k[index_j]).dot(e_ij);
             Real eta_ij = Real(Dimensions + 2) * mu_(index_i, index_i) * v_r_ij /
                           (r_ij + 0.01 * smoothing_length_);
-            force += 2.0 * kernel_correction_(index_i) * eta_ij *
-                     contact_neighborhood.dW_ij_[n] * wall_Vol_k[index_j] * e_ij;
+            force += 2.0 * e_ij.dot(kernel_correction_(index_i) * e_ij) * mu_(index_i, index_i) *
+                     eta_ij * contact_neighborhood.dW_ij_[n] * wall_Vol_k[index_j] * e_ij;
         }
     }
 
@@ -169,13 +171,15 @@ void ViscousForce<Contact<>, ViscosityType, KernelCorrectionType>::
         StdLargeVec<Vecd> &vel_k = *(contact_vel_[k]);
         StdLargeVec<Real> &wall_Vol_k = *(wall_Vol_[k]);
         KernelCorrectionType &kernel_correction_k = contact_kernel_corrections_[k];
-        Neighborhood &contact_neighborhood = (*contact_configuration_[k])[index_i];
+        const Neighborhood &contact_neighborhood = (*contact_configuration_[k])[index_i];
         for (size_t n = 0; n != contact_neighborhood.current_size_; ++n)
         {
             size_t index_j = contact_neighborhood.j_[n];
+            const Vecd &e_ij = contact_neighborhood.e_ij_[n];
+
             Vecd vel_derivative = (vel_[index_i] - vel_k[index_j]) /
                                   (contact_neighborhood.r_ij_[n] + 0.01 * smoothing_length_);
-            force += (kernel_correction_(index_i) + kernel_correction_k(index_j)) *
+            force += e_ij.dot((kernel_correction_(index_i) + kernel_correction_k(index_j)) * e_ij) *
                      contact_mu_k(index_i, index_j) * vel_derivative *
                      contact_neighborhood.dW_ij_[n] * wall_Vol_k[index_j];
         }
diff --git a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml
index 21f59ae38f..6ac4c2a0b0 100644
--- a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml
+++ b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_0_result.xml
@@ -4,6 +4,6 @@
         <Snapshot number_of_snapshot_for_local_result_="85" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="0.00071493151851457571" snapshot_1="1.8671420209230767" snapshot_2="3.0751153469115113" snapshot_3="3.5083165545913992" snapshot_4="3.6499000159957427" snapshot_5="3.6957395867589415" snapshot_6="3.7077003041706931" snapshot_7="3.7122882655266523" snapshot_8="3.7152477150973309" snapshot_9="3.7151262085675265" snapshot_10="3.7148927996841046" snapshot_11="3.715178699239428" snapshot_12="3.7157558053906392" snapshot_13="3.716574956657186" snapshot_14="3.716219478483576" snapshot_15="3.7151958023794083" snapshot_16="3.7165295353803902" snapshot_17="3.7162645407473618" snapshot_18="3.7153039053662309" snapshot_19="3.7152453910028869" snapshot_20="3.7160009904346021" snapshot_21="3.7147581296781373" snapshot_22="3.7148835836319929" snapshot_23="3.7171807152362817" snapshot_24="3.7149510990192258" snapshot_25="3.7148578234367773" snapshot_26="3.7145557332037402" snapshot_27="3.7143976899391795" snapshot_28="3.7169688899845221" snapshot_29="3.7153315678485734" snapshot_30="3.7139676938453183" snapshot_31="3.7167197133996592" snapshot_32="3.716944362783325" snapshot_33="3.7155014022731567" snapshot_34="3.7162541885313987" snapshot_35="3.7155631456101004" snapshot_36="3.7158836357059308" snapshot_37="3.7160259263092321" snapshot_38="3.7147599913631772" snapshot_39="3.7150222250382217" snapshot_40="3.7159523210008358" snapshot_41="3.7163272044396614" snapshot_42="3.7148778420494128" snapshot_43="3.7161200041745426" snapshot_44="3.7152663580886105" snapshot_45="3.7145097921218735" snapshot_46="3.7166015641056021" snapshot_47="3.7164184214824245" snapshot_48="3.7161861281516555" snapshot_49="3.7160587630451105" snapshot_50="3.7161060873020997" snapshot_51="3.7175827796062899" snapshot_52="3.7175485063347917" snapshot_53="3.7155352866347653" snapshot_54="3.7162622708619102" snapshot_55="3.7163333977406405" snapshot_56="3.7167329076082081" snapshot_57="3.7160842573233186" snapshot_58="3.7150105755869638" snapshot_59="3.717152233945717" snapshot_60="3.7165593475551835" snapshot_61="3.7156811924831894" snapshot_62="3.7149331915312227" snapshot_63="3.7151762335614382" snapshot_64="3.7163560977273624" snapshot_65="3.7166173935125868" snapshot_66="3.7156445659512078" snapshot_67="3.7163494901171275" snapshot_68="3.7169039755070963" snapshot_69="3.7161348907648999" snapshot_70="3.7168138655023411" snapshot_71="3.7173836467414119" snapshot_72="3.7162541598609309" snapshot_73="3.7149125926609825" snapshot_74="3.7171569339698851" snapshot_75="3.7166515966506783" snapshot_76="3.7160409139599282" snapshot_77="3.7164292961519094" snapshot_78="3.7153201951506412" snapshot_79="3.7169812645514688" snapshot_80="3.7161205637147088" snapshot_81="3.7138260451550269" snapshot_82="3.7158571368536975" snapshot_83="3.7174509473320745" snapshot_84="3.7159976340326271" />
+        <Particle_0 snapshot_0="0.00071493151851457571" snapshot_1="1.8540136756995136" snapshot_2="3.0422687890491842" snapshot_3="3.4632523688205596" snapshot_4="3.5993489755070986" snapshot_5="3.6429153549713922" snapshot_6="3.6557516666005254" snapshot_7="3.6600204030887866" snapshot_8="3.6614595673815984" snapshot_9="3.6617937178109878" snapshot_10="3.661938789136709" snapshot_11="3.6620523483967906" snapshot_12="3.6621867768315033" snapshot_13="3.6620412536037885" snapshot_14="3.6620378342896975" snapshot_15="3.6619525738071421" snapshot_16="3.662014423941824" snapshot_17="3.6619333033582442" snapshot_18="3.6619479283041505" snapshot_19="3.6623450917189002" snapshot_20="3.6621051320706659" snapshot_21="3.6620018083689687" snapshot_22="3.6618591331780728" snapshot_23="3.6619898395802895" snapshot_24="3.6624718212975003" snapshot_25="3.66185743946148" snapshot_26="3.6619656029543739" snapshot_27="3.6622932705218196" snapshot_28="3.6622104688058634" snapshot_29="3.6620630094248701" snapshot_30="3.662098929974321" snapshot_31="3.6621880800065902" snapshot_32="3.6622163546370254" snapshot_33="3.662065482586085" snapshot_34="3.6622332181905035" snapshot_35="3.6622784254214222" snapshot_36="3.6619603317212097" snapshot_37="3.6625174707863084" snapshot_38="3.6622527778243201" snapshot_39="3.6622242276280765" snapshot_40="3.6623000125990561" snapshot_41="3.6622366081973721" snapshot_42="3.6624617744125274" snapshot_43="3.6627223794736343" snapshot_44="3.6627185397395627" snapshot_45="3.6622826473369079" snapshot_46="3.6624573146760873" snapshot_47="3.6624223721716151" snapshot_48="3.6625374292471391" snapshot_49="3.6622144188262649" snapshot_50="3.6624240591512218" snapshot_51="3.6628186315631779" snapshot_52="3.6623139039527852" snapshot_53="3.6624798876087103" snapshot_54="3.6622262501591436" snapshot_55="3.6621384618100259" snapshot_56="3.6625823007734266" snapshot_57="3.6624252888908631" snapshot_58="3.6625240618208497" snapshot_59="3.6623015885772729" snapshot_60="3.6623823379361768" snapshot_61="3.6624131672921418" snapshot_62="3.6621613157159647" snapshot_63="3.6624248665372248" snapshot_64="3.6625080077524621" snapshot_65="3.6623151777939116" snapshot_66="3.6623932577292662" snapshot_67="3.6626708574004692" snapshot_68="3.6622131043208501" snapshot_69="3.6621954353550756" snapshot_70="3.6624379293794469" snapshot_71="3.6625922992644857" snapshot_72="3.6624749435771564" snapshot_73="3.6622988240166432" snapshot_74="3.6624334901187146" snapshot_75="3.6625726411219972" snapshot_76="3.6624568235798218" snapshot_77="3.6624612367005316" snapshot_78="3.6624019047761198" snapshot_79="3.6623250765229369" snapshot_80="3.6628988953039254" snapshot_81="3.6623174539190542" snapshot_82="3.662499730940517" snapshot_83="3.6626785966684769" snapshot_84="3.6624462249895835" />
     </Result_Element>
 </result>
diff --git a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml
index 0f3d27c3b9..ba8360a519 100644
--- a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml
+++ b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_3_result.xml
@@ -4,6 +4,6 @@
         <Snapshot number_of_snapshot_for_local_result_="85" />
     </Snapshot_Element>
     <Result_Element>
-        <Particle_0 snapshot_0="0.00071493151851457549" snapshot_1="1.8671420209230765" snapshot_2="3.0751153469115113" snapshot_3="3.5083165545913992" snapshot_4="3.6499000159957422" snapshot_5="3.6957395867589415" snapshot_6="3.7077003041706931" snapshot_7="3.7122882655266523" snapshot_8="3.7152477150973309" snapshot_9="3.7151262085675265" snapshot_10="3.7148927996841037" snapshot_11="3.715178699239428" snapshot_12="3.7157558053906405" snapshot_13="3.7165749566571864" snapshot_14="3.7162194784835751" snapshot_15="3.7151958023794061" snapshot_16="3.7165295353803884" snapshot_17="3.7162645407473804" snapshot_18="3.7153039053662358" snapshot_19="3.71524539100285" snapshot_20="3.7160009904346625" snapshot_21="3.7147581296783896" snapshot_22="3.7148835836325791" snapshot_23="3.7171807152358456" snapshot_24="3.714951099016981" snapshot_25="3.7148578234411289" snapshot_26="3.7145557332069377" snapshot_27="3.7143976899174427" snapshot_28="3.7169688899657505" snapshot_29="3.7153315680859036" snapshot_30="3.7139676947322648" snapshot_31="3.7167197150870166" snapshot_32="3.7169443925231231" snapshot_33="3.7155016042867772" snapshot_34="3.7162545762499879" snapshot_35="3.7155648335551454" snapshot_36="3.7159188333731317" snapshot_37="3.7161215860911279" snapshot_38="3.7148880899132841" snapshot_39="3.7154850033631424" snapshot_40="3.7167601048874768" snapshot_41="3.716711975466092" snapshot_42="3.7152236385926187" snapshot_43="3.7165010688905387" snapshot_44="3.7153142209322203" snapshot_45="3.7145869009049051" snapshot_46="3.716609382114636" snapshot_47="3.7164577725234365" snapshot_48="3.7161350998379037" snapshot_49="3.7161302415335977" snapshot_50="3.7161136742270129" snapshot_51="3.7175190577063688" snapshot_52="3.7175688199408885" snapshot_53="3.7155388710396435" snapshot_54="3.7162922829179736" snapshot_55="3.7162702188657755" snapshot_56="3.7168020305419187" snapshot_57="3.7160441299056401" snapshot_58="3.7150188424561064" snapshot_59="3.7171220798509852" snapshot_60="3.7165945413091963" snapshot_61="3.7156717708364844" snapshot_62="3.7149002438804586" snapshot_63="3.7152052563277485" snapshot_64="3.7162989268265321" snapshot_65="3.7166507920909488" snapshot_66="3.7156419261185762" snapshot_67="3.7164659080826032" snapshot_68="3.716825228945968" snapshot_69="3.7161516097530258" snapshot_70="3.7168659979535708" snapshot_71="3.7174024210323076" snapshot_72="3.7162372316973857" snapshot_73="3.7148737240064911" snapshot_74="3.7172228971469901" snapshot_75="3.7165483368997609" snapshot_76="3.7160458452651302" snapshot_77="3.7163738840778775" snapshot_78="3.7152457384172104" snapshot_79="3.7168690297316904" snapshot_80="3.7161460158670079" snapshot_81="3.7136398943283537" snapshot_82="3.7157335675986416" snapshot_83="3.7174892712834415" snapshot_84="3.7158492724039922" />
+        <Particle_0 snapshot_0="0.0007149315185145756" snapshot_1="1.8540136756995134" snapshot_2="3.0422687890491846" snapshot_3="3.4632523688205596" snapshot_4="3.5993489755070986" snapshot_5="3.6429153549713922" snapshot_6="3.6557516666005254" snapshot_7="3.6600204030887871" snapshot_8="3.6614595673815984" snapshot_9="3.6617937178109883" snapshot_10="3.6619387891367086" snapshot_11="3.6620523483967897" snapshot_12="3.6621867768315033" snapshot_13="3.6620412536037881" snapshot_14="3.6620378342896971" snapshot_15="3.6619525738071439" snapshot_16="3.6620144239418235" snapshot_17="3.6619333033582437" snapshot_18="3.6619479283041505" snapshot_19="3.6623450917189029" snapshot_20="3.6621051320706619" snapshot_21="3.6620018083689612" snapshot_22="3.6618591331780364" snapshot_23="3.6619898395802211" snapshot_24="3.6624718212974239" snapshot_25="3.6618574394613566" snapshot_26="3.6619656029556351" snapshot_27="3.6622932705191311" snapshot_28="3.6622104688071158" snapshot_29="3.6620630094787874" snapshot_30="3.662098930082216" snapshot_31="3.6621880806320082" snapshot_32="3.6622163635759848" snapshot_33="3.6620655144814243" snapshot_34="3.662233309799356" snapshot_35="3.6622791901348348" snapshot_36="3.6619668575983857" snapshot_37="3.6625327271139927" snapshot_38="3.6622899931068398" snapshot_39="3.6623710815716159" snapshot_40="3.6624272210179303" snapshot_41="3.662314733306796" snapshot_42="3.6625609718443553" snapshot_43="3.6628374408802831" snapshot_44="3.6627854875052064" snapshot_45="3.6623571939836621" snapshot_46="3.6625823527394465" snapshot_47="3.6624865497474732" snapshot_48="3.6625992607225948" snapshot_49="3.6623213122201106" snapshot_50="3.6625110537609396" snapshot_51="3.662887128075627" snapshot_52="3.6624176079874342" snapshot_53="3.6625955581840119" snapshot_54="3.6622692659391638" snapshot_55="3.6622171173658549" snapshot_56="3.6627080650131116" snapshot_57="3.6625136805842904" snapshot_58="3.6625731375012016" snapshot_59="3.6624110143093427" snapshot_60="3.6625150347937336" snapshot_61="3.6624627178494942" snapshot_62="3.6622509788150475" snapshot_63="3.6625102338101625" snapshot_64="3.6626226355836904" snapshot_65="3.6624132346227367" snapshot_66="3.6624987693642499" snapshot_67="3.6627607813862806" snapshot_68="3.6622767313312878" snapshot_69="3.6623394280942381" snapshot_70="3.6625468784576078" snapshot_71="3.6626851806980993" snapshot_72="3.6625470256597561" snapshot_73="3.6624450586584842" snapshot_74="3.6625064439883248" snapshot_75="3.6626832412554053" snapshot_76="3.6626192440480345" snapshot_77="3.662525478410942" snapshot_78="3.6625070428879587" snapshot_79="3.6624052085679901" snapshot_80="3.6630606648099304" snapshot_81="3.6623817210620264" snapshot_82="3.6625541231991248" snapshot_83="3.6628499673942363" snapshot_84="3.662568063617833" />
     </Result_Element>
 </result>
diff --git a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml
new file mode 100644
index 0000000000..834c8af597
--- /dev/null
+++ b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_5_result.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<result>
+    <Snapshot_Element>
+        <Snapshot number_of_snapshot_for_local_result_="85" />
+    </Snapshot_Element>
+    <Result_Element>
+        <Particle_0 snapshot_0="0.00071493151851457571" snapshot_1="1.8540136756995134" snapshot_2="3.0422687890491842" snapshot_3="3.4632523688205596" snapshot_4="3.5993489755070995" snapshot_5="3.6429153549713922" snapshot_6="3.6557516666005254" snapshot_7="3.6600204030887866" snapshot_8="3.6614595673815988" snapshot_9="3.6617937178109878" snapshot_10="3.661938789136709" snapshot_11="3.6620523483967897" snapshot_12="3.6621867768315037" snapshot_13="3.6620412536037885" snapshot_14="3.6620378342896975" snapshot_15="3.661952573807143" snapshot_16="3.662014423941824" snapshot_17="3.661933303358242" snapshot_18="3.6619479283041505" snapshot_19="3.6623450917189073" snapshot_20="3.6621051320706566" snapshot_21="3.6620018083689505" snapshot_22="3.6618591331779982" snapshot_23="3.6619898395801576" snapshot_24="3.6624718212973635" snapshot_25="3.6618574394614902" snapshot_26="3.6619656029575345" snapshot_27="3.6622932705194309" snapshot_28="3.6622104688327974" snapshot_29="3.662063009708957" snapshot_30="3.6620989306474634" snapshot_31="3.6621880832123317" snapshot_32="3.6622164035058358" snapshot_33="3.6620656569280925" snapshot_34="3.6622337148268915" snapshot_35="3.6622825812099453" snapshot_36="3.6619939378758413" snapshot_37="3.6625839020693589" snapshot_38="3.6623769579439993" snapshot_39="3.6625729246134684" snapshot_40="3.6625400396839489" snapshot_41="3.6623615272920191" snapshot_42="3.662587449150267" snapshot_43="3.6628401276250289" snapshot_44="3.6627837169919601" snapshot_45="3.66236264749555" snapshot_46="3.6625884651722109" snapshot_47="3.662473684271319" snapshot_48="3.6626070288858426" snapshot_49="3.6623233942493703" snapshot_50="3.6625062979563423" snapshot_51="3.6628823157357111" snapshot_52="3.6624265082468561" snapshot_53="3.6625956777724631" snapshot_54="3.6622577543271611" snapshot_55="3.6622252197091294" snapshot_56="3.6627078633195378" snapshot_57="3.6625118742965506" snapshot_58="3.6625664164670373" snapshot_59="3.6624210288108037" snapshot_60="3.6625111796611716" snapshot_61="3.6624566829519947" snapshot_62="3.662257329535028" snapshot_63="3.6625047129337265" snapshot_64="3.6626248169397115" snapshot_65="3.6624116048395599" snapshot_66="3.6625084915919457" snapshot_67="3.6627504613250013" snapshot_68="3.6622776046363077" snapshot_69="3.6623463858203658" snapshot_70="3.6625428040124519" snapshot_71="3.6626844629290032" snapshot_72="3.6625476994555917" snapshot_73="3.6624545493886069" snapshot_74="3.6624941088396827" snapshot_75="3.6626901836022663" snapshot_76="3.6626236150407703" snapshot_77="3.6625205061193062" snapshot_78="3.6625043752122211" snapshot_79="3.6624112248032756" snapshot_80="3.6630663083887933" snapshot_81="3.6623694932954667" snapshot_82="3.6625602229983247" snapshot_83="3.6628520902614072" snapshot_84="3.6625672876216022" />
+    </Result_Element>
+</result>
diff --git a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_6_result.xml b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_6_result.xml
deleted file mode 100644
index 19ffb9658b..0000000000
--- a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_Run_6_result.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<result>
-    <Snapshot_Element>
-        <Snapshot number_of_snapshot_for_local_result_="85" />
-    </Snapshot_Element>
-    <Result_Element>
-        <Particle_0 snapshot_0="0.00071493151851457571" snapshot_1="1.8671420209230765" snapshot_2="3.0751153469115118" snapshot_3="3.5083165545913997" snapshot_4="3.6499000159957422" snapshot_5="3.6957395867589415" snapshot_6="3.7077003041706935" snapshot_7="3.7122882655266523" snapshot_8="3.7152477150973309" snapshot_9="3.7151262085675265" snapshot_10="3.7148927996841046" snapshot_11="3.715178699239428" snapshot_12="3.7157558053906401" snapshot_13="3.716574956657186" snapshot_14="3.716219478483576" snapshot_15="3.7151958023794078" snapshot_16="3.7165295353803902" snapshot_17="3.7162645407473667" snapshot_18="3.7153039053662331" snapshot_19="3.7152453910028762" snapshot_20="3.7160009904346243" snapshot_21="3.7147581296782288" snapshot_22="3.7148835836322203" snapshot_23="3.7171807152361076" snapshot_24="3.7149510990183154" snapshot_25="3.7148578234384679" snapshot_26="3.7145557332046124" snapshot_27="3.714397689928846" snapshot_28="3.7169688899706723" snapshot_29="3.7153315678404795" snapshot_30="3.713967693932708" snapshot_31="3.7167197133938243" snapshot_32="3.7169443645097027" snapshot_33="3.7155014139644331" snapshot_34="3.7162542050063241" snapshot_35="3.7155632363146687" snapshot_36="3.7158855867634513" snapshot_37="3.7160318425631598" snapshot_38="3.7147711068178646" snapshot_39="3.7151043788831739" snapshot_40="3.7162500294707397" snapshot_41="3.7165083788870024" snapshot_42="3.715041656360595" snapshot_43="3.7162533434973444" snapshot_44="3.715238439772707" snapshot_45="3.714516005543306" snapshot_46="3.7164669296053976" snapshot_47="3.7162590289892292" snapshot_48="3.7160995736921589" snapshot_49="3.7159908006246138" snapshot_50="3.7159582023960702" snapshot_51="3.7174622140573756" snapshot_52="3.7173734865701373" snapshot_53="3.715457936650056" snapshot_54="3.7161370110932266" snapshot_55="3.7162703643280617" snapshot_56="3.7167853758722407" snapshot_57="3.7159174071500161" snapshot_58="3.7149023055906643" snapshot_59="3.7170491729024175" snapshot_60="3.7165234769848796" snapshot_61="3.7154987730504461" snapshot_62="3.7149047705311347" snapshot_63="3.7150688891055541" snapshot_64="3.7162597362708292" snapshot_65="3.7165293683018286" snapshot_66="3.7153363596881026" snapshot_67="3.7160743657283986" snapshot_68="3.716907156464083" snapshot_69="3.7161349706271882" snapshot_70="3.7163621992315936" snapshot_71="3.7171648522724419" snapshot_72="3.7160861714877758" snapshot_73="3.715115583382361" snapshot_74="3.7170927218744874" snapshot_75="3.7164619526296843" snapshot_76="3.7160309918535157" snapshot_77="3.7164858046307327" snapshot_78="3.7151789933235921" snapshot_79="3.7168138373176705" snapshot_80="3.7161664627843947" snapshot_81="3.713844762238625" snapshot_82="3.7158077912940506" snapshot_83="3.717230715702688" snapshot_84="3.7161648646756973" />
-    </Result_Element>
-</result>
diff --git a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml
index 36b6bf2534..8018a3a600 100644
--- a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml
+++ b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_dtwdistance.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dtw_distance>
-    <DTWDistance TotalKineticEnergy_0="0.004" />
+    <DTWDistance TotalKineticEnergy_0="0.002" />
 </dtw_distance>
diff --git a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_runtimes.dat b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_runtimes.dat
index 34de7daedb..de07de18db 100644
--- a/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_runtimes.dat
+++ b/tests/2d_examples/test_2d_poiseuille_flow/regression_test_tool/WaterBody_TotalKineticEnergy_runtimes.dat
@@ -1,3 +1,3 @@
 true
-7
+6
 4
\ No newline at end of file