diff --git a/ippl/src/Utility/CMakeLists.txt b/ippl/src/Utility/CMakeLists.txt
index c378109e6c2851a0fc1b7730d40e48a38f582cef..88a1946b2f2e3a8d8b33a9f02a2228b104c6e6e7 100644
--- a/ippl/src/Utility/CMakeLists.txt
+++ b/ippl/src/Utility/CMakeLists.txt
@@ -25,7 +25,6 @@ SET (_SRCS
   )
 
 SET (_HDRS
-  bstring.h
   DiscBuffer.h
   DiscConfig.h
   DiscField.hpp
@@ -62,7 +61,6 @@ SET (_HDRS
   Pooled.hpp
   Pooled.h
   Pool.h
-  Pstring.h
   RandomNumberGen.h
   RefBlock.h
   RefCounted.h
diff --git a/src/unit_tests/classic_src/Fields/Interpolation/PPSolveFactoryTest.cpp b/tests/classic_src/Fields/Interpolation/PPSolveFactoryTest.cpp
similarity index 100%
rename from src/unit_tests/classic_src/Fields/Interpolation/PPSolveFactoryTest.cpp
rename to tests/classic_src/Fields/Interpolation/PPSolveFactoryTest.cpp
diff --git a/src/unit_tests/classic_src/Fields/Interpolation/PolynomialPatchTest.cpp b/tests/classic_src/Fields/Interpolation/PolynomialPatchTest.cpp
similarity index 100%
rename from src/unit_tests/classic_src/Fields/Interpolation/PolynomialPatchTest.cpp
rename to tests/classic_src/Fields/Interpolation/PolynomialPatchTest.cpp
diff --git a/src/unit_tests/classic_src/Fields/Interpolation/SolveFactoryTest.cpp b/tests/classic_src/Fields/Interpolation/SolveFactoryTest.cpp
similarity index 100%
rename from src/unit_tests/classic_src/Fields/Interpolation/SolveFactoryTest.cpp
rename to tests/classic_src/Fields/Interpolation/SolveFactoryTest.cpp
diff --git a/src/unit_tests/classic_src/Fields/Interpolation/SquarePolynomialVectorTest.cpp b/tests/classic_src/Fields/Interpolation/SquarePolynomialVectorTest.cpp
similarity index 100%
rename from src/unit_tests/classic_src/Fields/Interpolation/SquarePolynomialVectorTest.cpp
rename to tests/classic_src/Fields/Interpolation/SquarePolynomialVectorTest.cpp
diff --git a/src/unit_tests/classic_src/Fields/Interpolation/ThreeDGridTest.cpp b/tests/classic_src/Fields/Interpolation/ThreeDGridTest.cpp
similarity index 100%
rename from src/unit_tests/classic_src/Fields/Interpolation/ThreeDGridTest.cpp
rename to tests/classic_src/Fields/Interpolation/ThreeDGridTest.cpp