diff --git a/tests/math/testpimathmatrix.cpp b/tests/math/testpimathmatrix.cpp
index 09992b89..d2751587 100644
--- a/tests/math/testpimathmatrix.cpp
+++ b/tests/math/testpimathmatrix.cpp
@@ -54,106 +54,66 @@ TEST(PIMathMatrix_Test, identity)
 
 TEST(PIMathMatrix_Test, matrixRow)
 {
-    PIMathMatrix<double> origMatr;
-    PIMathMatrix<double> matrix;
     PIMathVector<double> vector;
-    uint i;
-    bool b;
     vector.resize(3, 3.0);
-    vector.fill(5.0);
-    matrix = origMatr.matrixRow(vector);
-    for(i = 0; i < vector.size(); i++)
+    auto matrix = PIMathMatrix<double>::matrixRow(vector);
+    for(uint i = 0; i < vector.size(); i++)
     {
-        if(matrix[0][i] == 5.0)
+        if(matrix[0][i] != 3.0)
         {
-            b = true;
-        }
-        else
-        {
-            b = false;
-            break;
+            ASSERT_TRUE(false);
         }
     }
-    ASSERT_TRUE(b);
+    ASSERT_TRUE(true);
 }
 
 TEST(PIMathMatrix_Test, matrixCol)
 {
-    PIMathMatrix<double> origMatr;
-    PIMathMatrix<double> matrix;
     PIMathVector<double> vector;
-    uint i;
-    bool b;
     vector.resize(3, 3.0);
-    vector.fill(5.0);
-    matrix = origMatr.matrixCol(vector);
-    for(i = 0; i < vector.size(); i++)
+    auto matrix = PIMathMatrix<double>::matrixCol(vector);
+    for(uint i = 0; i < vector.size(); i++)
     {
-        if(matrix[i][0] == 5.0)
+        if(matrix[i][0] != 3.0)
         {
-            b = true;
-        }
-        else
-        {
-            b = false;
-            break;
+            ASSERT_TRUE(false);
         }
     }
-    ASSERT_TRUE(b);
+    ASSERT_TRUE(true);
 }
 
 TEST(PIMathMatrix_Test, setCol)
 {
-    PIMathMatrix<double> origMatr;
-    PIMathMatrix<double> matrix;
     PIMathVector<double> vector;
-    uint i;
-    bool b;
     vector.resize(3, 3.0);
-    vector.fill(5.0);
-    matrix = origMatr.matrixCol(vector);
+    auto matrix = PIMathMatrix<double>::matrixCol(vector);
     vector.fill(10.0);
     matrix.setCol(0, vector);
-    for(i = 0; i < vector.size(); i++)
+    for(uint i = 0; i < vector.size(); i++)
     {
-        if(matrix[i][0] == 10.0)
+        if(matrix[i][0] != 10.0)
         {
-            b = true;
-        }
-        else
-        {
-            b = false;
-            break;
+            ASSERT_TRUE(false);
         }
     }
-    ASSERT_TRUE(b);
+    ASSERT_TRUE(true);
 }
 
 TEST(PIMathMatrix_Test, setRow)
 {
-    PIMathMatrix<double> origMatr;
-    PIMathMatrix<double> matrix;
     PIMathVector<double> vector;
-    uint i;
-    bool b;
     vector.resize(3, 3.0);
-    vector.fill(5.0);
-    matrix = origMatr.matrixRow(vector);
+    auto matrix = PIMathMatrix<double>::matrixRow(vector);
     vector.fill(10.0);
     matrix.setRow(0, vector);
-    for(i = 0; i < vector.size(); i++)
+    for(uint i = 0; i < vector.size(); i++)
     {
-        if(matrix[0][i] == 10.0)
+        if(matrix[0][i] != 10.0)
         {
-            b = true;
-        }
-        else
-        {
-            b = false;
-            break;
+            ASSERT_TRUE(false);
         }
     }
-    ASSERT_TRUE(b);
+    ASSERT_TRUE(true);
 }
 
 TEST(PIMathMatrix_Test, swapCols)
@@ -758,4 +718,4 @@ TEST(PIMathMatrix_Test, transposed)
         b = false;
     }
     ASSERT_TRUE(b);
-}
+}
\ No newline at end of file