diff --git a/basic-geometry-test/basic-geometry-test.cbp b/basic-geometry-test/basic-geometry-test.cbp
index f17f2d6..f78d161 100644
--- a/basic-geometry-test/basic-geometry-test.cbp
+++ b/basic-geometry-test/basic-geometry-test.cbp
@@ -42,17 +42,97 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
-		<Unit filename="fp32_vector2_test.c">
+		<Unit filename="helpers.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="fp32_vector2_test.h" />
-		<Unit filename="geometry_test.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="geometry_test.h" />
+		<Unit filename="helpers.h" />
 		<Unit filename="main.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="tests/utilities.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/utilities.h" />
+		<Unit filename="tests/utilities/are_close.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/utilities/are_close.h" />
+		<Unit filename="tests/utilities/is_unit.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/utilities/is_unit.h" />
+		<Unit filename="tests/utilities/is_zero.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/utilities/is_zero.h" />
+		<Unit filename="tests/vector2.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector2.h" />
+		<Unit filename="tests/vector2/vector2_copy.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector2/vector2_copy.h" />
+		<Unit filename="tests/vector2/vector2_reset.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector2/vector2_reset.h" />
+		<Unit filename="tests/vector2/vector2_set_values.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector2/vector2_set_values.h" />
+		<Unit filename="tests/vector2/vector2_swap.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector2/vector2_swap.h" />
+		<Unit filename="tests/vector3.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector3.h" />
+		<Unit filename="tests/vector3/vector3_copy.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector3/vector3_copy.h" />
+		<Unit filename="tests/vector3/vector3_reset.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector3/vector3_reset.h" />
+		<Unit filename="tests/vector3/vector3_set_values.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector3/vector3_set_values.h" />
+		<Unit filename="tests/vector3/vector3_swap.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/vector3/vector3_swap.h" />
+		<Unit filename="tests/versor.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/versor.h" />
+		<Unit filename="tests/versor/versor_are_close.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/versor/versor_are_close.h" />
+		<Unit filename="tests/versor/versor_combine.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/versor/versor_combine.h" />
+		<Unit filename="tests/versor/versor_copy.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/versor/versor_copy.h" />
+		<Unit filename="tests/versor/versor_reset.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/versor/versor_reset.h" />
+		<Unit filename="tests/versor/versor_set_values.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/versor/versor_set_values.h" />
+		<Unit filename="tests/versor/versor_swap.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="tests/versor/versor_swap.h" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>
diff --git a/basic-geometry-test/tests/versor.h b/basic-geometry-test/tests/versor.h
index 4b8fac9..0e8df7d 100644
--- a/basic-geometry-test/tests/versor.h
+++ b/basic-geometry-test/tests/versor.h
@@ -6,6 +6,7 @@
 #include "./versor/versor_copy.h"
 #include "./versor/versor_swap.h"
 #include "./versor/versor_are_close.h"
+#include "./versor/versor_combine.h"
 
 int test_bgc_versor_reset();
 
diff --git a/basic-geometry-test/tests/versor/versor_swap.h b/basic-geometry-test/tests/versor/versor_swap.h
index 8befa4c..175ff4b 100644
--- a/basic-geometry-test/tests/versor/versor_swap.h
+++ b/basic-geometry-test/tests/versor/versor_swap.h
@@ -1,8 +1,8 @@
 #ifndef _TEST_VECTOR2_SWAP_H_
 #define _TEST_VECTOR2_SWAP_H_
 
-int test_bgc_vector2_swap_fp32();
+int test_bgc_versor_swap_fp32();
 
-int test_bgc_vector2_swap_fp64();
+int test_bgc_versor_swap_fp64();
 
 #endif
diff --git a/basic-geometry/basic-geometry.cbp b/basic-geometry/basic-geometry.cbp
index c9af3f6..c7039a3 100644
--- a/basic-geometry/basic-geometry.cbp
+++ b/basic-geometry/basic-geometry.cbp
@@ -70,10 +70,10 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="rotation3.h" />
-		<Unit filename="tangent.c">
+		<Unit filename="tangent-pair.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="tangent.h" />
+		<Unit filename="tangent-pair.h" />
 		<Unit filename="utilities.c">
 			<Option compilerVar="CC" />
 		</Unit>