diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33c5b2f..2f0c230 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,14 +18,14 @@ add_library(VectorAlgebra STATIC "src/Vector3.cpp" "src/Quaternion.cpp")
 enable_testing()
 
 add_executable(
-    hello_test
-    "test/hello_test.cc"
-)
+ VectorAlgebraTest
+ "test/hello_test.cc"
+ "test/Vector3_test.cc")
 target_link_libraries(
-    hello_test
-    gtest
-    VectorAlgebra
+ VectorAlgebraTest
+ gtest_main
+ VectorAlgebra
 )
 
 include(GoogleTest)
-gtest_discover_tests(hello_test)
+gtest_discover_tests(VectorAlgebraTest)
diff --git a/test/Vector3_test.cc b/test/Vector3_test.cc
new file mode 100644
index 0000000..744d5f2
--- /dev/null
+++ b/test/Vector3_test.cc
@@ -0,0 +1,28 @@
+#include <gtest/gtest.h>
+#include "Vector3.h"
+
+TEST(Vector, Normalize) {
+	bool r;
+
+	Vector3 v = Vector3(0, 2, 0);
+	Vector3 normalized_v = Vector3::zero;
+
+	normalized_v = v.normalized();
+	r = normalized_v == Vector3(0, 1, 0);
+	EXPECT_EQ(r, true);
+
+	normalized_v = Vector3::Normalize(v);
+	r = normalized_v == Vector3(0, 1, 0);
+	EXPECT_EQ(r, true);
+}
+
+TEST(Vector, Magnitude) {
+	Vector3 v = Vector3(1, 2, 3);
+	float m = 0;
+
+	m = v.magnitude();
+	EXPECT_FLOAT_EQ(m, 3.74165738677F);
+
+	m = Vector3::Magnitude(v);
+	EXPECT_FLOAT_EQ(m, 3.74165738677F);
+}
diff --git a/test/hello_test.cc b/test/hello_test.cc
index e385faa..6046370 100644
--- a/test/hello_test.cc
+++ b/test/hello_test.cc
@@ -1,41 +1,13 @@
 #include <gtest/gtest.h>
-#include "Vector3.h"
 
-// Demonstrate some basic assertions
-TEST(DummyTest, BasicAssertions) {
-    // Expect two strings not to be equal.
-    EXPECT_STRNE("hello", "world");
-    // Expect equality.
-    EXPECT_EQ(7 * 6, 42);
-}
+namespace Passer {
 
-TEST(Vector, Normalize) {
-    bool r;
+    // Demonstrate some basic assertions
+    TEST(DummyTest, BasicAssertions) {
+        // Expect two strings not to be equal.
+        EXPECT_STRNE("hello", "world");
+        // Expect equality.
+        EXPECT_EQ(7 * 6, 42);
+    }
 
-    Vector3 v = Vector3(0, 2, 0);
-    Vector3 normalized_v = Vector3::zero;
-
-    normalized_v = v.normalized();
-    r = normalized_v == Vector3(0, 1, 0);
-    EXPECT_EQ(r, true);
-
-    normalized_v = Vector3::Normalize(v);
-    r = normalized_v == Vector3(0, 1, 0);
-    EXPECT_EQ(r, true);
-}
-
-TEST(Vector, Magnitude) {
-    Vector3 v = Vector3(1, 2, 3);
-    float m = 0;
-
-    m = v.magnitude();
-    EXPECT_FLOAT_EQ(m, 3.74165738677F);
-
-    m = Vector3::Magnitude(v);
-    EXPECT_FLOAT_EQ(m, 3.74165738677F);
-}
-
-int main(int argc, char **argv) {
-    :: testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
+}
\ No newline at end of file