diff --git a/tests/functionality/FunctionalityTestHelper.cpp b/tests/functionality/FunctionalityTestHelper.cpp
index fd9d5edc..e90768ad 100644
--- a/tests/functionality/FunctionalityTestHelper.cpp
+++ b/tests/functionality/FunctionalityTestHelper.cpp
@@ -14,23 +14,9 @@
 #include <resolve/LinSolverIterativeFGMRES.hpp>
 #include <resolve/workspace/LinAlgWorkspace.hpp>
 #include <resolve/SystemSolver.hpp>
-#if defined RESOLVE_USE_KLU
-#include <resolve/LinSolverDirectKLU.hpp>
-#endif
-#if defined (RESOLVE_USE_CUDA)
-#include <resolve/LinSolverDirectCuSolverRf.hpp>
-  using workspace_type = ReSolve::LinAlgWorkspaceCUDA;
-  std::string memory_space("cuda");
-#elif defined (RESOLVE_USE_HIP)
-#include <resolve/LinSolverDirectRocSolverRf.hpp>
-  using workspace_type = ReSolve::LinAlgWorkspaceHIP;
-  std::string memory_space("hip");
-#else
-  using workspace_type = ReSolve::LinAlgWorkspaceCpu;
-  std::string memory_space("cpu");
-#endif
 #include "FunctionalityTestHelper.hpp"
 
+
 namespace ReSolve {
   namespace tests{
 
diff --git a/tests/functionality/FunctionalityTestHelper.hpp b/tests/functionality/FunctionalityTestHelper.hpp
index e50ecf19..1d82ee4f 100644
--- a/tests/functionality/FunctionalityTestHelper.hpp
+++ b/tests/functionality/FunctionalityTestHelper.hpp
@@ -1,3 +1,46 @@
+namespace ReSolve
+{ 
+  namespace vector
+  {
+    class Vector;
+  }
+  namespace matrix
+  {
+    class Sparse;
+    class Coo;
+    class Csc;
+    class Csr;
+  }
+
+  class LinAlgWorkspaceCUDA;
+
+  class LinAlgWorkspaceHIP;
+
+  class LinAlgWorkspaceCpu;
+
+  class SystemSolver;
+
+  class MatrixHandler;
+
+  class VectorHandler;
+}
+
+#if defined RESOLVE_USE_KLU
+#include <resolve/LinSolverDirectKLU.hpp>
+#endif
+#if defined (RESOLVE_USE_CUDA)
+//#include <resolve/LinSolverDirectCuSolverRf.hpp>
+  using workspace_type = ReSolve::LinAlgWorkspaceCUDA;
+  std::string memory_space("cuda");
+#elif defined (RESOLVE_USE_HIP)
+#include <resolve/LinSolverDirectRocSolverRf.hpp>
+  using workspace_type = ReSolve::LinAlgWorkspaceHIP;
+  std::string memory_space("hip");
+#else
+  using workspace_type = ReSolve::LinAlgWorkspaceCpu;
+  std::string memory_space("cpu");
+#endif
+
 namespace ReSolve 
 {
   namespace tests