diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f1e02f..9951bc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,8 +28,8 @@ add_executable(wavetable_test tests/wavetable_test.cpp)
 add_executable(generators_test tests/generators_test.cpp)
 
 target_link_libraries(wtpp_test GTest::gtest_main)
-target_link_libraries(wave_test GTest::gtest_main)
-target_link_libraries(wavetable_test GTest::gtest_main)
+target_link_libraries(wave_test wave GTest::gtest_main)
+target_link_libraries(wavetable_test wave wavetable GTest::gtest_main)
 target_link_libraries(generators_test generators GTest::gtest_main)
 
 include(GoogleTest)
diff --git a/tests/wave_test.cpp b/tests/wave_test.cpp
index 1d612cd..cafbeb3 100644
--- a/tests/wave_test.cpp
+++ b/tests/wave_test.cpp
@@ -1,9 +1,6 @@
 #include "../src/wave.h"
 #include "gtest/gtest.h"
 
-// Initialize index at 0 for wave cycles
-uint16_t Wave::m_nid = 0;
-
 TEST(Wave, DefaultConstructor)
 {
   Wave w1, w2;
diff --git a/tests/wavetable_test.cpp b/tests/wavetable_test.cpp
index bc20242..103af52 100644
--- a/tests/wavetable_test.cpp
+++ b/tests/wavetable_test.cpp
@@ -1,10 +1,6 @@
 #include "../src/wavetable.h"
 #include "gtest/gtest.h"
 
-// Initialize index at 0 for wave cycles
-uint16_t Wave::m_nid = 0;
-uint16_t Wavetable::m_nid = 0;
-
 TEST(Wavetable, DefaultConstructor)
 {
   Wavetable w1("PPG"), w2("!PPG");
@@ -13,7 +9,7 @@ TEST(Wavetable, DefaultConstructor)
   EXPECT_EQ(w2.getId(), 1);
   // Check name is correct
   // std::string name = w1.name();
-  // EXPECT_EQ(name, "PPG");
+  EXPECT_EQ(w1.name(), "0: PPG");
 }
 
 TEST(Wavetable, CopyConstructor) {
@@ -22,8 +18,7 @@ TEST(Wavetable, CopyConstructor) {
   // Check id is correct
   EXPECT_EQ(w2.getId(), 0);
   // Sample name is correct
-  // std::string name = w2.name();
-  // EXPECT_EQ(name, "PPG");
+  EXPECT_EQ(w2.name(), "0: PPG");
 }
 
 TEST(Wavetable, CopyAssignment) {
@@ -32,6 +27,5 @@ TEST(Wavetable, CopyAssignment) {
   // Check id is correct
   EXPECT_EQ(w2.getId(), 0);
   // Check name is correct
-  // std::string name = w2.name();
-  // EXPECT_EQ(name, "PPG");
+  EXPECT_EQ(w2.name(), "0: PPG");
 }