diff --git a/test/gtc/gtc_matrix_access.cpp b/test/gtc/gtc_matrix_access.cpp
index 4f911d4b..b853b506 100644
--- a/test/gtc/gtc_matrix_access.cpp
+++ b/test/gtc/gtc_matrix_access.cpp
@@ -16,8 +16,8 @@ int test_mat2x2_row_set()
     
     glm::mat2x2 m(1);
     
-	glm::row(m, 0, glm::vec2( 0,  1));
-	glm::row(m, 1, glm::vec2( 4,  5));
+	m = glm::row(m, 0, glm::vec2( 0,  1));
+	m = glm::row(m, 1, glm::vec2( 4,  5));
 
     Error += glm::row(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
@@ -31,8 +31,8 @@ int test_mat2x2_col_set()
     
     glm::mat2x2 m(1);
     
-	glm::column(m, 0, glm::vec2( 0,  1));
-	glm::column(m, 1, glm::vec2( 4,  5));
+	m = glm::column(m, 0, glm::vec2( 0,  1));
+	m = glm::column(m, 1, glm::vec2( 4,  5));
 
     Error += glm::column(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
@@ -46,9 +46,9 @@ int test_mat2x3_row_set()
     
     glm::mat2x3 m(1);
     
-	glm::row(m, 0, glm::vec2( 0,  1));
-	glm::row(m, 1, glm::vec2( 4,  5));
-	glm::row(m, 2, glm::vec2( 8,  9));
+	m = glm::row(m, 0, glm::vec2( 0,  1));
+	m = glm::row(m, 1, glm::vec2( 4,  5));
+	m = glm::row(m, 2, glm::vec2( 8,  9));
 
     Error += glm::row(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
@@ -63,8 +63,8 @@ int test_mat2x3_col_set()
     
     glm::mat2x3 m(1);
     
-	glm::column(m, 0, glm::vec3( 0,  1,  2));
-	glm::column(m, 1, glm::vec3( 4,  5,  6));
+	m = glm::column(m, 0, glm::vec3( 0,  1,  2));
+	m = glm::column(m, 1, glm::vec3( 4,  5,  6));
 
     Error += glm::column(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
@@ -78,15 +78,15 @@ int test_mat2x4_row_set()
     
     glm::mat2x4 m(1);
     
-	glm::row(m, 0, glm::vec2( 0,  1));
-	glm::row(m, 1, glm::vec2( 4,  5));
-	glm::row(m, 2, glm::vec2( 8,  9));
-	glm::row(m, 3, glm::vec2(12, 13));
+	m = glm::row(m, 0, glm::vec2( 0,  1));
+	m = glm::row(m, 1, glm::vec2( 4,  5));
+	m = glm::row(m, 2, glm::vec2( 8,  9));
+	m = glm::row(m, 3, glm::vec2(12, 13));
 
     Error += glm::row(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
     Error += glm::row(m, 2) == glm::vec2( 8,  9) ? 0 : 1;
-	Error += glm::row(m, 2) == glm::vec2(12, 13) ? 0 : 1;
+	Error += glm::row(m, 3) == glm::vec2(12, 13) ? 0 : 1;
 
     return Error;
 }
@@ -97,8 +97,8 @@ int test_mat2x4_col_set()
     
     glm::mat2x4 m(1);
     
-	glm::column(m, 0, glm::vec4( 0,  1,  2, 3));
-	glm::column(m, 1, glm::vec4( 4,  5,  6, 7));
+	m = glm::column(m, 0, glm::vec4( 0,  1,  2, 3));
+	m = glm::column(m, 1, glm::vec4( 4,  5,  6, 7));
 
     Error += glm::column(m, 0) == glm::vec4( 0,  1,  2, 3) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec4( 4,  5,  6, 7) ? 0 : 1;
@@ -112,8 +112,8 @@ int test_mat3x2_row_set()
     
     glm::mat3x2 m(1);
     
-	glm::row(m, 0, glm::vec3( 0,  1,  2));
-	glm::row(m, 1, glm::vec3( 4,  5,  6));
+	m = glm::row(m, 0, glm::vec3( 0,  1,  2));
+	m = glm::row(m, 1, glm::vec3( 4,  5,  6));
 
     Error += glm::row(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
@@ -127,9 +127,9 @@ int test_mat3x2_col_set()
     
     glm::mat3x2 m(1);
     
-	glm::column(m, 0, glm::vec2( 0,  1));
-	glm::column(m, 1, glm::vec2( 4,  5));
-	glm::column(m, 2, glm::vec2( 8,  9));
+	m = glm::column(m, 0, glm::vec2( 0,  1));
+	m = glm::column(m, 1, glm::vec2( 4,  5));
+	m = glm::column(m, 2, glm::vec2( 8,  9));
 
     Error += glm::column(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
@@ -144,9 +144,9 @@ int test_mat3x3_row_set()
     
     glm::mat3x3 m(1);
     
-	glm::row(m, 0, glm::vec3( 0,  1,  2));
-	glm::row(m, 1, glm::vec3( 4,  5,  6));
-	glm::row(m, 2, glm::vec3( 8,  9, 10));
+	m = glm::row(m, 0, glm::vec3( 0,  1,  2));
+	m = glm::row(m, 1, glm::vec3( 4,  5,  6));
+	m = glm::row(m, 2, glm::vec3( 8,  9, 10));
 
     Error += glm::row(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
@@ -161,9 +161,9 @@ int test_mat3x3_col_set()
     
     glm::mat3x3 m(1);
     
-	glm::column(m, 0, glm::vec3( 0,  1,  2));
-	glm::column(m, 1, glm::vec3( 4,  5,  6));
-	glm::column(m, 2, glm::vec3( 8,  9, 10));
+	m = glm::column(m, 0, glm::vec3( 0,  1,  2));
+	m = glm::column(m, 1, glm::vec3( 4,  5,  6));
+	m = glm::column(m, 2, glm::vec3( 8,  9, 10));
 
     Error += glm::column(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
@@ -178,10 +178,10 @@ int test_mat3x4_row_set()
     
     glm::mat3x4 m(1);
     
-	glm::row(m, 0, glm::vec3( 0,  1,  2));
-	glm::row(m, 1, glm::vec3( 4,  5,  6));
-	glm::row(m, 2, glm::vec3( 8,  9, 10));
-	glm::row(m, 3, glm::vec3(12, 13, 14));
+	m = glm::row(m, 0, glm::vec3( 0,  1,  2));
+	m = glm::row(m, 1, glm::vec3( 4,  5,  6));
+	m = glm::row(m, 2, glm::vec3( 8,  9, 10));
+	m = glm::row(m, 3, glm::vec3(12, 13, 14));
 
     Error += glm::row(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
@@ -197,9 +197,9 @@ int test_mat3x4_col_set()
     
     glm::mat3x4 m(1);
     
-	glm::column(m, 0, glm::vec4( 0,  1,  2, 3));
-	glm::column(m, 1, glm::vec4( 4,  5,  6, 7));
-	glm::column(m, 2, glm::vec4( 8,  9, 10, 11));
+	m = glm::column(m, 0, glm::vec4( 0,  1,  2, 3));
+	m = glm::column(m, 1, glm::vec4( 4,  5,  6, 7));
+	m = glm::column(m, 2, glm::vec4( 8,  9, 10, 11));
 
     Error += glm::column(m, 0) == glm::vec4( 0,  1,  2, 3) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec4( 4,  5,  6, 7) ? 0 : 1;
@@ -214,8 +214,8 @@ int test_mat4x2_row_set()
     
     glm::mat4x2 m(1);
     
-	glm::row(m, 0, glm::vec4( 0,  1,  2,  3));
-	glm::row(m, 1, glm::vec4( 4,  5,  6,  7));
+	m = glm::row(m, 0, glm::vec4( 0,  1,  2,  3));
+	m = glm::row(m, 1, glm::vec4( 4,  5,  6,  7));
 
     Error += glm::row(m, 0) == glm::vec4( 0,  1,  2,  3) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
@@ -229,10 +229,10 @@ int test_mat4x2_col_set()
     
     glm::mat4x2 m(1);
     
-	glm::column(m, 0, glm::vec2( 0,  1));
-	glm::column(m, 1, glm::vec2( 4,  5));
-	glm::column(m, 2, glm::vec2( 8,  9));
-	glm::column(m, 3, glm::vec2(12, 13));
+	m = glm::column(m, 0, glm::vec2( 0,  1));
+	m = glm::column(m, 1, glm::vec2( 4,  5));
+	m = glm::column(m, 2, glm::vec2( 8,  9));
+	m = glm::column(m, 3, glm::vec2(12, 13));
 
     Error += glm::column(m, 0) == glm::vec2( 0,  1) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec2( 4,  5) ? 0 : 1;
@@ -248,9 +248,9 @@ int test_mat4x3_row_set()
     
     glm::mat4x3 m(1);
     
-	glm::row(m, 0, glm::vec4( 0,  1,  2,  3));
-	glm::row(m, 1, glm::vec4( 4,  5,  6,  7));
-	glm::row(m, 2, glm::vec4( 8,  9, 10, 11));
+	m = glm::row(m, 0, glm::vec4( 0,  1,  2,  3));
+	m = glm::row(m, 1, glm::vec4( 4,  5,  6,  7));
+	m = glm::row(m, 2, glm::vec4( 8,  9, 10, 11));
 
     Error += glm::row(m, 0) == glm::vec4( 0,  1,  2,  3) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
@@ -265,10 +265,10 @@ int test_mat4x3_col_set()
     
     glm::mat4x3 m(1);
     
-	glm::column(m, 0, glm::vec3( 0,  1,  2));
-	glm::column(m, 1, glm::vec3( 4,  5,  6));
-	glm::column(m, 2, glm::vec3( 8,  9, 10));
-	glm::column(m, 3, glm::vec3(12, 13, 14));
+	m = glm::column(m, 0, glm::vec3( 0,  1,  2));
+	m = glm::column(m, 1, glm::vec3( 4,  5,  6));
+	m = glm::column(m, 2, glm::vec3( 8,  9, 10));
+	m = glm::column(m, 3, glm::vec3(12, 13, 14));
 
     Error += glm::column(m, 0) == glm::vec3( 0,  1,  2) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec3( 4,  5,  6) ? 0 : 1;
@@ -284,10 +284,10 @@ int test_mat4x4_row_set()
     
     glm::mat4 m(1);
     
-	glm::row(m, 0, glm::vec4( 0,  1,  2,  3));
-	glm::row(m, 1, glm::vec4( 4,  5,  6,  7));
-	glm::row(m, 2, glm::vec4( 8,  9, 10, 11));
-	glm::row(m, 3, glm::vec4(12, 13, 14, 15));
+	m = glm::row(m, 0, glm::vec4( 0,  1,  2,  3));
+	m = glm::row(m, 1, glm::vec4( 4,  5,  6,  7));
+	m = glm::row(m, 2, glm::vec4( 8,  9, 10, 11));
+	m = glm::row(m, 3, glm::vec4(12, 13, 14, 15));
 
     Error += glm::row(m, 0) == glm::vec4( 0,  1,  2,  3) ? 0 : 1;
     Error += glm::row(m, 1) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
@@ -303,10 +303,10 @@ int test_mat4x4_col_set()
     
     glm::mat4 m(1);
     
-	glm::column(m, 0, glm::vec4( 0,  1,  2,  3));
-	glm::column(m, 1, glm::vec4( 4,  5,  6,  7));
-	glm::column(m, 2, glm::vec4( 8,  9, 10, 11));
-	glm::column(m, 3, glm::vec4(12, 13, 14, 15));
+	m = glm::column(m, 0, glm::vec4( 0,  1,  2,  3));
+	m = glm::column(m, 1, glm::vec4( 4,  5,  6,  7));
+	m = glm::column(m, 2, glm::vec4( 8,  9, 10, 11));
+	m = glm::column(m, 3, glm::vec4(12, 13, 14, 15));
 
     Error += glm::column(m, 0) == glm::vec4( 0,  1,  2,  3) ? 0 : 1;
     Error += glm::column(m, 1) == glm::vec4( 4,  5,  6,  7) ? 0 : 1;
diff --git a/test/gtc/gtc_matrix_inverse.cpp b/test/gtc/gtc_matrix_inverse.cpp
index 0b9bc908..324900f4 100644
--- a/test/gtc/gtc_matrix_inverse.cpp
+++ b/test/gtc/gtc_matrix_inverse.cpp
@@ -4,12 +4,11 @@
 // Created : 2010-09-16
 // Updated : 2010-09-16
 // Licence : This source is under MIT licence
-// File    : test/gtc/matrix_transform.cpp
+// File    : test/gtc/matrix_inverse.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define GLM_MESSAGES
 #include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/matrix_inverse.hpp>
 
 int main()
 {
diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp
index c018ae68..72bf13a4 100644
--- a/test/gtc/gtc_quaternion.cpp
+++ b/test/gtc/gtc_quaternion.cpp
@@ -2,18 +2,17 @@
 // OpenGL Mathematics Copyright (c) 2005 - 2011 G-Truc Creation (www.g-truc.net)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Created : 2010-09-16
-// Updated : 2010-09-16
+// Updated : 2010-05-07
 // Licence : This source is under MIT licence
-// File    : test/gtc/matrix_transform.cpp
+// File    : test/gtc/quaternion.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define GLM_MESSAGES
 #include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
+#include <glm/gtc/quaternion.hpp>
 
 int main()
 {
-	int Error = -1;
+	int Error = 0;
 
 	return Error;
 }