diff --git a/src/fx_components.h b/src/fx_components.h
index d48060a..abf3385 100644
--- a/src/fx_components.h
+++ b/src/fx_components.h
@@ -311,7 +311,7 @@ private:
 };
 
 
-typedef ComplexLFO LFO;
+typedef InterpolatedSineOscillator LFO;
 
 
 class JitterGenerator : public FXBase
diff --git a/src/test/test_cpp.cpp b/src/test/test_cpp.cpp
index 99fc501..0d1664b 100644
--- a/src/test/test_cpp.cpp
+++ b/src/test/test_cpp.cpp
@@ -1,8 +1,6 @@
 #include <gtest/gtest.h>
 
 #include "../fx_components.h"
-#include <chrono>
-#include <fstream>
 
 int nb = 0;
 
diff --git a/src/test/test_framework.cpp b/src/test/test_framework.cpp
index b3402c2..4eeddc7 100644
--- a/src/test/test_framework.cpp
+++ b/src/test/test_framework.cpp
@@ -1,7 +1,6 @@
 #include <gtest/gtest.h>
 
 #include "test_fx_helper.h"
-#include "wave.h"
 
 #include "../debug.hpp"
 #include "../fx_base.h"
diff --git a/src/test/test_fx_components.cpp b/src/test/test_fx_components.cpp
index 06624a1..9438bc2 100644
--- a/src/test/test_fx_components.cpp
+++ b/src/test/test_fx_components.cpp
@@ -2,13 +2,6 @@
 #include <iomanip>
 #include <iostream>
 #include <fstream>
-#include <sstream>
-#include <string>
-#include <locale>
-#include <ctime>
-#include <cmath>
-#include <random>
-#include "wave.h"
 
 #include "test_fx_helper.h"
 
diff --git a/src/test/test_fx_helper.h b/src/test/test_fx_helper.h
index 7975390..d5607bf 100644
--- a/src/test/test_fx_helper.h
+++ b/src/test/test_fx_helper.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <gtest/gtest.h>
 
+#include "wave.h"
 #include "../fx.h"
 
 #define AUDIO_SOURCE_FILE "test.wav"
diff --git a/src/test/test_fx.cpp b/src/test/test_fx_plate_reverb.cpp
similarity index 97%
rename from src/test/test_fx.cpp
rename to src/test/test_fx_plate_reverb.cpp
index d6aaf77..a6d2a86 100644
--- a/src/test/test_fx.cpp
+++ b/src/test/test_fx_plate_reverb.cpp
@@ -1,11 +1,10 @@
 #include <gtest/gtest.h>
 
 #include "test_fx_helper.h"
-#include "wave.h"
 
 #include "../effect_platervbstereo.h"
 
-TEST(FXElement, PlateReverbMigration)
+TEST(FXPlateReverb, Migration)
 {
     const testing::TestInfo* test_info = testing::UnitTest::GetInstance()->current_test_info();
     std::string full_test_name = test_info->test_case_name();
diff --git a/src/test/test_fx_rack.cpp b/src/test/test_fx_rack.cpp
index 78ec6d9..e721a3a 100644
--- a/src/test/test_fx_rack.cpp
+++ b/src/test/test_fx_rack.cpp
@@ -2,10 +2,8 @@
 #include <cmath>
 
 #include "test_fx_helper.h"
-#include "wave.h"
 
 #include "../fx_rack.h"
-#include "../effect_platervbstereo.h"
 
 using namespace std;