diff --git a/src/basics/tests/testUtilities.h b/src/basics/tests/testUtilities.h
index d9aab27d9e2c4b67d61f8a74b3945e90e9b891b2..c70d9cc5c11633ded6b696d92692e3d4edf8d2ca 100644
--- a/src/basics/tests/testUtilities.h
+++ b/src/basics/tests/testUtilities.h
@@ -9,4 +9,4 @@ inline auto RealEq = [](auto value) {
 #endif
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutine.h b/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutine.h
index 091b9b840fe35bf1fee2232f956574ead51ce6ab..39866728b713c9c0c72cb5c62ba02f242e0ca68c 100644
--- a/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutine.h
+++ b/src/gpu/VirtualFluids_GPU/Communication/CommunicationRoutine.h
@@ -16,4 +16,4 @@ public:
 };
 } // namespace vf::gpu
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp
index 64561db4dee74673c525d88bb15b1333565af829..2ae473665cf77324e62e1fa50c2ed79b3c654ff6 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp
@@ -323,7 +323,7 @@ void IndexRearrangementForStreams::reorderSendIndicesForCommAfterFtoC(
                   << " direction: " << direction;
     if (para->getParH(level)->intCF.kCF == 0 || para->getParH(level)->intFC.kFC == 0)
         *logging::out << logging::Logger::LOGGER_ERROR
-                      << "reorderSendIndicesForCommAfterFtoC(): para->getParH(level)->intCF needs to be inititalized before calling "
+                      << "reorderSendIndicesForCommAfterFtoC(): para->getParH(level)->intCF needs to be initialized before calling "
                          "this function "
                       << "\n";
 
diff --git a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp
index 1025b1fa94592a68b280205e8d25174ad5966a1b..664552b2f47542cc6ae3d4940c2b74ede1beff91 100644
--- a/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp
+++ b/src/gpu/VirtualFluids_GPU/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp
@@ -9,7 +9,7 @@
 #include "gpu/GridGenerator/grid/GridImp.h"
 
 template <typename T>
-bool vectorsAreEqual(const T * vector1, const std::vector<T> vectorExpected)
+bool vectorsAreEqual(const T * vector1, const std::vector<T>& vectorExpected)
 {
     for (uint i = 0; i < vectorExpected.size(); i++) {
         if (vector1[i] != vectorExpected[i])
@@ -25,7 +25,7 @@ private:
     LevelGridBuilderDouble() = default;
 
 public:
-    LevelGridBuilderDouble(SPtr<Grid> grid) : LevelGridBuilder(), grid(grid){};
+    explicit LevelGridBuilderDouble(SPtr<Grid> grid) : LevelGridBuilder(), grid(grid){};
     SPtr<Grid> getGrid(uint) override
     {
         return grid;
@@ -44,14 +44,13 @@ public:
     {
     }
 
-    static SPtr<GridImpDouble> makeShared(Object *object, real startX, real startY, real startZ, real endX, real endY,
-                                          real endZ, real delta, Distribution d, uint level)
+    static SPtr<GridImpDouble> makeShared()
     {
-        SPtr<GridImpDouble> grid(new GridImpDouble(object, startX, startY, startZ, endX, endY, endZ, delta, d, level));
+        SPtr<GridImpDouble> grid(new GridImpDouble(nullptr, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, Distribution(), 1));
         return grid;
     }
 
-    void setFluidNodeIndicesBorder(std::vector<uint> fluidNodeIndicesBorder)
+    void setFluidNodeIndicesBorder(const std::vector<uint>& fluidNodeIndicesBorder)
     {
         this->fluidNodeIndicesBorder = fluidNodeIndicesBorder;
     }
@@ -101,7 +100,7 @@ private:
     std::unique_ptr<InterpolationCellGrouper> createTestSubjectCFBorderBulk()
     {
         SPtr<GridImpDouble> grid =
-            GridImpDouble::makeShared(nullptr, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, Distribution(), 1);
+            GridImpDouble::makeShared();
         grid->setFluidNodeIndicesBorder(cf.fluidNodeIndicesBorder);
         std::shared_ptr<LevelGridBuilderDouble> builder = std::make_shared<LevelGridBuilderDouble>(grid);
 
@@ -195,7 +194,7 @@ private:
     std::unique_ptr<InterpolationCellGrouper> createTestSubjectFCBorderBulk()
     {
         SPtr<GridImpDouble> grid =
-            GridImpDouble::makeShared(nullptr, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 1.0, Distribution(), 1);
+            GridImpDouble::makeShared();
         grid->setFluidNodeIndicesBorder(fc.fluidNodeIndicesBorder);
         std::shared_ptr<LevelGridBuilderDouble> builder = std::make_shared<LevelGridBuilderDouble>(grid);
 
diff --git a/src/gpu/VirtualFluids_GPU/Utilities/testUtilitiesGPU.h b/src/gpu/VirtualFluids_GPU/Utilities/testUtilitiesGPU.h
index 9c0eb8d6ee4ee58bf6845c6a4ddf39c2dccfdf99..884c33fad875f80569ecbbdba6d05cbe0c0c6ba7 100644
--- a/src/gpu/VirtualFluids_GPU/Utilities/testUtilitiesGPU.h
+++ b/src/gpu/VirtualFluids_GPU/Utilities/testUtilitiesGPU.h
@@ -19,4 +19,4 @@ inline SPtr<Parameter> createParameterForLevel(uint level)
 
 } // namespace testingVF
 
-#endif
\ No newline at end of file
+#endif