diff --git a/examples/anisotropic-crystal/CMakeFiles/Snakefile.in b/examples/anisotropic-crystal/CMakeFiles/Snakefile.in index 8b55ec3d7..aa1bc03d0 100644 --- a/examples/anisotropic-crystal/CMakeFiles/Snakefile.in +++ b/examples/anisotropic-crystal/CMakeFiles/Snakefile.in @@ -30,7 +30,7 @@ rule run_solver: config="specfem_config.yaml", output: seismograms=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd", station_name=[ "S0010", "S0020", @@ -59,7 +59,7 @@ rule run_solver: rule plot_seismogram: input: trace_files=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd", station_name=[ "S0010", "S0020", @@ -91,16 +91,21 @@ rule plot_seismogram: "S0040", "S0050", ] + files = [glob.glob(directory + f"/{stationname}*.sem*")[0] for stationname in station_name] ## iterate over all seismograms for filename in files: station_id = os.path.splitext(filename)[0] station_id = station_id.split("/")[-1] + # ------------------------- + # FIX ME PLEASE!!!!!!!!!!!! network = station_id[5:7] station = station_id[0:5] location = "00" component = station_id[7:10] + # FIX ME PLEASE!!!!!!!!!!!! + # ------------------------- trace = np.loadtxt(filename, delimiter=" ") starttime = trace[0, 0] dt = trace[1, 0] - trace[0, 0] diff --git a/examples/fluid-solid-bathymetry/Snakefile b/examples/fluid-solid-bathymetry/Snakefile index ed1a3e751..0f65958e4 100644 --- a/examples/fluid-solid-bathymetry/Snakefile +++ b/examples/fluid-solid-bathymetry/Snakefile @@ -53,7 +53,7 @@ rule run_simulation: specfem_config="specfem_config.yaml", output: pressure_seismograms=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semp", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semp", station_name=[ "S0001", "S0002", @@ -79,7 +79,7 @@ rule run_simulation: rule plot_seismogram: input: pressure_seismograms=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semp", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semp", station_name=[ "S0001", "S0002", @@ -106,14 +106,18 @@ rule plot_seismogram: ## iterate over all seismograms for filename in files: station_name = os.path.splitext(filename)[0] - station_name = station_name.split("/")[-1] + network, station, location, channel = station_name.split("/")[-1].split(".") trace = np.loadtxt(filename, delimiter=" ") starttime = trace[0, 0] dt = trace[1, 0] - trace[0, 0] traces.append( obspy.Trace( trace[:, 1], - {"network": station_name, "starttime": starttime, "delta": dt}, + {"network": network, + "station": station, + "location": location, + "channel": channel, + "starttime": starttime, "delta": dt}, ) ) diff --git a/examples/fluid-solid-interface/Snakefile b/examples/fluid-solid-interface/Snakefile index 7bde155bc..a314c2e1c 100644 --- a/examples/fluid-solid-interface/Snakefile +++ b/examples/fluid-solid-interface/Snakefile @@ -30,7 +30,7 @@ rule run_solver: config="specfem_config.yaml", output: seismograms=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd", station_name=[ "S0001", "S0002", @@ -65,7 +65,7 @@ rule run_solver: rule plot_seismogram: input: trace_files=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd", station_name=[ "S0001", "S0002", @@ -102,14 +102,18 @@ rule plot_seismogram: ## iterate over all seismograms for filename in files: station_name = os.path.splitext(filename)[0] - station_name = station_name.split("/")[-1] + network, station, location, channel = station_name.split("/")[-1].split(".") trace = np.loadtxt(filename, delimiter=" ") starttime = trace[0, 0] dt = trace[1, 0] - trace[0, 0] traces.append( obspy.Trace( trace[:, 1], - {"network": station_name, "starttime": starttime, "delta": dt}, + {"network": network, + "station": station, + "location": location, + "channel": channel, + "starttime": starttime, "delta": dt}, ) ) diff --git a/examples/homogeneous-medium-flat-topography/Snakefile b/examples/homogeneous-medium-flat-topography/Snakefile index 1a04380a1..251abe9c3 100644 --- a/examples/homogeneous-medium-flat-topography/Snakefile +++ b/examples/homogeneous-medium-flat-topography/Snakefile @@ -30,7 +30,7 @@ rule run_solver: config="specfem_config.yaml", output: siesmograms=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semv", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semv", station_name=["S0001", "S0002", "S0003", "S0004", "S0005", "S0006"], network_name=["AA"], component=["BXX", "BXZ"], @@ -53,7 +53,7 @@ rule run_solver: rule plot_seismogram: input: trace_files=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semv", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semv", station_name=["S0001", "S0002", "S0003", "S0004", "S0005", "S0006"], network_name=["AA"], component=["BXX", "BXZ"], @@ -77,14 +77,17 @@ rule plot_seismogram: ## iterate over all seismograms for filename in files: station_name = os.path.splitext(filename)[0] - station_name = station_name.split("/")[-1] + network, station, location, channel = station_name.split("/")[-1].split(".") trace = np.loadtxt(filename, delimiter=" ") starttime = trace[0, 0] dt = trace[1, 0] - trace[0, 0] traces.append( obspy.Trace( trace[:, 1], - {"network": station_name, "starttime": starttime, "delta": dt}, + {"network": network, + "station": station, + "location": location, + "channel": channel, "starttime": starttime, "delta": dt}, ) ) diff --git a/examples/solid-solid-interface/Snakefile b/examples/solid-solid-interface/Snakefile index 5676b79d8..49d7a2304 100644 --- a/examples/solid-solid-interface/Snakefile +++ b/examples/solid-solid-interface/Snakefile @@ -30,7 +30,7 @@ rule run_solver: config="specfem_config.yaml", output: seismograms=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd", station_name=[ "S0001", ], @@ -55,7 +55,7 @@ rule run_solver: rule plot_seismogram: input: trace_files=expand( - "OUTPUT_FILES/results/{station_name}.{network_name}.S2.{component}.semd", + "OUTPUT_FILES/results/{network_name}.{station_name}.S2.{component}.semd", station_name=[ "S0001", ], @@ -82,14 +82,18 @@ rule plot_seismogram: ## iterate over all seismograms for filename in files: station_name = os.path.splitext(filename)[0] - station_name = station_name.split("/")[-1] + network, station, location, channel = station_name.split("/")[-1].split(".") trace = np.loadtxt(filename, delimiter=" ") starttime = trace[0, 0] dt = trace[1, 0] - trace[0, 0] traces.append( obspy.Trace( trace[:, 1], - {"network": station_name, "starttime": starttime, "delta": dt}, + {"network": network, + "station": station, + "location": location, + "channel": channel, + "starttime": starttime, "delta": dt}, ) ) diff --git a/src/IO/receivers.cpp b/src/IO/receivers.cpp index 5b1024f30..131a0e801 100644 --- a/src/IO/receivers.cpp +++ b/src/IO/receivers.cpp @@ -31,9 +31,14 @@ specfem::IO::read_receivers(const std::string stations_file, } // check if the read line meets the format assert(current_station.size() == 6); + /* Get the network and station name + * Note that the station name is the second element in the vector + * and the network name is the first element. This is standard in + * the STATIONS file format. + */ + const std::string station_name = current_station[0]; + const std::string network_name = current_station[1]; // get the x and z coordinates of the station; - const std::string network_name = current_station[0]; - const std::string station_name = current_station[1]; const type_real x = static_cast(std::stod(current_station[2])); const type_real z = static_cast(std::stod(current_station[3])); diff --git a/tests/unit-tests/displacement_tests/Newmark/newmark_tests.cpp b/tests/unit-tests/displacement_tests/Newmark/newmark_tests.cpp index 4b1ba11fa..d1bfcede0 100644 --- a/tests/unit-tests/displacement_tests/Newmark/newmark_tests.cpp +++ b/tests/unit-tests/displacement_tests/Newmark/newmark_tests.cpp @@ -252,34 +252,34 @@ TEST(DISPLACEMENT_TESTS, newmark_scheme_tests) { std::vector filename; switch (seismogram_type) { case specfem::wavefield::type::displacement: - filename.push_back(Test.database.traces + "/" + station_name + "." + - network_name + ".BXX.semd"); - filename.push_back(Test.database.traces + "/" + station_name + "." + - network_name + ".BXZ.semd"); + filename.push_back(Test.database.traces + "/" + network_name + "." + + station_name + ".S2.BXX.semd"); + filename.push_back(Test.database.traces + "/" + network_name + "." + + station_name + ".S2.BXZ.semd"); break; case specfem::wavefield::type::velocity: - filename.push_back(Test.database.traces + "/" + station_name + "." + - network_name + ".BXX.semv"); - filename.push_back(Test.database.traces + "/" + station_name + "." + - network_name + ".BXZ.semv"); + filename.push_back(Test.database.traces + "/" + network_name + "." + + station_name + ".S2.BXX.semv"); + filename.push_back(Test.database.traces + "/" + network_name + "." + + station_name + ".S2.BXZ.semv"); break; case specfem::wavefield::type::acceleration: - filename.push_back(Test.database.traces + "/" + station_name + "." + - network_name + ".BXX.sema"); - filename.push_back(Test.database.traces + "/" + station_name + "." + - network_name + ".BXZ.sema"); + filename.push_back(Test.database.traces + "/" + network_name + "." + + station_name + ".S2.BXX.sema"); + filename.push_back(Test.database.traces + "/" + network_name + "." + + station_name + ".S2.BXZ.sema"); break; case specfem::wavefield::type::pressure: - filename.push_back(Test.database.traces + "/" + station_name + "." + - network_name + ".PRE.semp"); + filename.push_back(Test.database.traces + "/" + network_name + "." + + station_name + ".S2.PRE.semp"); break; default: FAIL() << "--------------------------------------------------\n" << "\033[0;31m[FAILED]\033[0m Test failed\n" << " - Test name: " << Test.name << "\n" << " - Error: Unknown seismogram type\n" - << " - Station: " << station_name << "\n" << " - Network: " << network_name << "\n" + << " - Station: " << station_name << "\n" << "--------------------------------------------------\n\n" << std::endl; break; @@ -311,8 +311,8 @@ TEST(DISPLACEMENT_TESTS, newmark_scheme_tests) { << "\033[0;31m[FAILED]\033[0m Test failed\n" << " - Test name: " << Test.name << "\n" << " - Error: Times do not match\n" - << " - Station: " << station_name << "\n" << " - Network: " << network_name << "\n" + << " - Station: " << station_name << "\n" << " - Component: " << icomp << "\n" << " - Expected: " << time << "\n" << " - Computed: " << computed_time << "\n" diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0001.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0002.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0003.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0004.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0005.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0006.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0007.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0008.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0009.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0010.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0011.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0012.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0013.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0014.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0015.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0016.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0017.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0018.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0019.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test1/traces/AA.S0020.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0001.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0002.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0003.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0004.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0005.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0006.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0007.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0008.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0009.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0010.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0011.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0012.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0013.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0014.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test2/traces/AA.S0015.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test3/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test4/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0012.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0012.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0012.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0012.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0012.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0012.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0012.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0012.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0013.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0013.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0013.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0013.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0013.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0013.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0013.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0013.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0014.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0014.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0014.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0014.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0014.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0014.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0014.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0014.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0015.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0015.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0015.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0015.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0015.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0015.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0015.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0015.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0016.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0016.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0016.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0016.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0016.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0016.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0016.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0016.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0017.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0017.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0017.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0017.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0017.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0017.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0017.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0017.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0018.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0018.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0018.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0018.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0018.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0018.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0018.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0018.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0019.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0019.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0019.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0019.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0019.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0019.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0019.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0019.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0020.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0020.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0020.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0020.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0020.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0020.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0020.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0020.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0021.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0021.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0021.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0021.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0021.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0021.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0021.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0021.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0022.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0022.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0022.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0022.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0022.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0022.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0022.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0022.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0023.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0023.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0023.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0023.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0023.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0023.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0023.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0023.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0024.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0024.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0024.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0024.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0024.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0024.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0024.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0024.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0025.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0025.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0025.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0025.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0025.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0025.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0025.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0025.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0026.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0026.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0026.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0026.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0026.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0026.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0026.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0026.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0027.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0027.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0027.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0027.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0027.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0027.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0027.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0027.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0028.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0028.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0028.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0028.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0028.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0028.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0028.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0028.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0029.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0029.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0029.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0029.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0029.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0029.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0029.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0029.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0030.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0030.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0030.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0030.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0030.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0030.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0030.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0030.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0031.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0031.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0031.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0031.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0031.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0031.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0031.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0031.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0032.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0032.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0032.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0032.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0032.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0032.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0032.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0032.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0033.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0033.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0033.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0033.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0033.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0033.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0033.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0033.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0034.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0034.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0034.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0034.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0034.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0034.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0034.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0034.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0035.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0035.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0035.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0035.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0035.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0035.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0035.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0035.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0036.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0036.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0036.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0036.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0036.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0036.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0036.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0036.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0037.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0037.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0037.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0037.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0037.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0037.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0037.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0037.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0038.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0038.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0038.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0038.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0038.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0038.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0038.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0038.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0039.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0039.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0039.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0039.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0039.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0039.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0039.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0039.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0040.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0040.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0040.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0040.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0040.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0040.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0040.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0040.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0041.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0041.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0041.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0041.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0041.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0041.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0041.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0041.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0042.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0042.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0042.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0042.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0042.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0042.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0042.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0042.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0043.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0043.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0043.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0043.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0043.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0043.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0043.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0043.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0044.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0044.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0044.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0044.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0044.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0044.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0044.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0044.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0045.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0045.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0045.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0045.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0045.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0045.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0045.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0045.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0046.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0046.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0046.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0046.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0046.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0046.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0046.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0046.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0047.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0047.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0047.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0047.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0047.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0047.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0047.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0047.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0048.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0048.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0048.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0048.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0048.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0048.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0048.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0048.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0049.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0049.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0049.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0049.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0049.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0049.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0049.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0049.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0050.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0050.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0050.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0050.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0050.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0050.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0050.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0050.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0051.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0051.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0051.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0051.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0051.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0051.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0051.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0051.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0052.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0052.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0052.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0052.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0052.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0052.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0052.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0052.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0053.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0053.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0053.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0053.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0053.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0053.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0053.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0053.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0054.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0054.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0054.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0054.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0054.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0054.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0054.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0054.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0055.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0055.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0055.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0055.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0055.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0055.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0055.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0055.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0056.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0056.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0056.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0056.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0056.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0056.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0056.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0056.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0057.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0057.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0057.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0057.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0057.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0057.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0057.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0057.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0058.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0058.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0058.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0058.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0058.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0058.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0058.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0058.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0059.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0059.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0059.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0059.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0059.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0059.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0059.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0059.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0060.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0060.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0060.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0060.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0060.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0060.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0060.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test5/traces/AA.S0060.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0012.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0012.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0012.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0012.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0012.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0012.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0012.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0012.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0013.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0013.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0013.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0013.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0013.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0013.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0013.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0013.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0014.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0014.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0014.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0014.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0014.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0014.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0014.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0014.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0015.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0015.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0015.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0015.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0015.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0015.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0015.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0015.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0016.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0016.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0016.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0016.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0016.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0016.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0016.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0016.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0017.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0017.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0017.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0017.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0017.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0017.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0017.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0017.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0018.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0018.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0018.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0018.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0018.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0018.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0018.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0018.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0019.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0019.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0019.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0019.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0019.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0019.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0019.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0019.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0020.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0020.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0020.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0020.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0020.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0020.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0020.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0020.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0021.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0021.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0021.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0021.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0021.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0021.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0021.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0021.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0022.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0022.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0022.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0022.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0022.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0022.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0022.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0022.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0023.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0023.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0023.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0023.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0023.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0023.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0023.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0023.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0024.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0024.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0024.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0024.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0024.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0024.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0024.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0024.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0025.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0025.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0025.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0025.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0025.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0025.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0025.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0025.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0026.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0026.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0026.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0026.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0026.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0026.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0026.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0026.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0027.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0027.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0027.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0027.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0027.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0027.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0027.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0027.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0028.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0028.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0028.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0028.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0028.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0028.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0028.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0028.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0029.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0029.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0029.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0029.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0029.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0029.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0029.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0029.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0030.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0030.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0030.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0030.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0030.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0030.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0030.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0030.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0031.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0031.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0031.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0031.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0031.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0031.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0031.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0031.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0032.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0032.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0032.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0032.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0032.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0032.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0032.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0032.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0033.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0033.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0033.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0033.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0033.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0033.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0033.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0033.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0034.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0034.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0034.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0034.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0034.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0034.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0034.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0034.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0035.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0035.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0035.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0035.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0035.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0035.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0035.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0035.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0036.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0036.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0036.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0036.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0036.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0036.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0036.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0036.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0037.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0037.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0037.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0037.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0037.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0037.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0037.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0037.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0038.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0038.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0038.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0038.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0038.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0038.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0038.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0038.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0039.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0039.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0039.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0039.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0039.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0039.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0039.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0039.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0040.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0040.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0040.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0040.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0040.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0040.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0040.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0040.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0041.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0041.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0041.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0041.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0041.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0041.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0041.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0041.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0042.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0042.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0042.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0042.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0042.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0042.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0042.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0042.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0043.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0043.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0043.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0043.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0043.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0043.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0043.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0043.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0044.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0044.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0044.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0044.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0044.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0044.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0044.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0044.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0045.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0045.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0045.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0045.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0045.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0045.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0045.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0045.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0046.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0046.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0046.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0046.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0046.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0046.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0046.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0046.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0047.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0047.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0047.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0047.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0047.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0047.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0047.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0047.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0048.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0048.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0048.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0048.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0048.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0048.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0048.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0048.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0049.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0049.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0049.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0049.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0049.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0049.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0049.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0049.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0050.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0050.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0050.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0050.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0050.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0050.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0050.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0050.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0051.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0051.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0051.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0051.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0051.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0051.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0051.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0051.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0052.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0052.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0052.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0052.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0052.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0052.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0052.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0052.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0053.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0053.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0053.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0053.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0053.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0053.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0053.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0053.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0054.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0054.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0054.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0054.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0054.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0054.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0054.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0054.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0055.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0055.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0055.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0055.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0055.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0055.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0055.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0055.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0056.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0056.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0056.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0056.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0056.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0056.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0056.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0056.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0057.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0057.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0057.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0057.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0057.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0057.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0057.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0057.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0058.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0058.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0058.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0058.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0058.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0058.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0058.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0058.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0059.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0059.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0059.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0059.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0059.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0059.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0059.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0059.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0060.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0060.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0060.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0060.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0060.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0060.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0060.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test6/traces/AA.S0060.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0012.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0012.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0012.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0012.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0012.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0012.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0012.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0012.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0013.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0013.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0013.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0013.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0013.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0013.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0013.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0013.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0014.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0014.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0014.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0014.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0014.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0014.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0014.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0014.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0015.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0015.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0015.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0015.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0015.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0015.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0015.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0015.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0016.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0016.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0016.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0016.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0016.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0016.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0016.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0016.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0017.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0017.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0017.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0017.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0017.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0017.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0017.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0017.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0018.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0018.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0018.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0018.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0018.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0018.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0018.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0018.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0019.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0019.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0019.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0019.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0019.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0019.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0019.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0019.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0020.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0020.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0020.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0020.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0020.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0020.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0020.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0020.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0021.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0021.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0021.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0021.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0021.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0021.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0021.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0021.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0022.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0022.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0022.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0022.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0022.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0022.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0022.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0022.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0023.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0023.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0023.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0023.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0023.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0023.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0023.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0023.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0024.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0024.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0024.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0024.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0024.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0024.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0024.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0024.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0025.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0025.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0025.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0025.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0025.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0025.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0025.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0025.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0026.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0026.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0026.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0026.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0026.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0026.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0026.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0026.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0027.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0027.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0027.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0027.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0027.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0027.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0027.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0027.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0028.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0028.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0028.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0028.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0028.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0028.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0028.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0028.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0029.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0029.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0029.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0029.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0029.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0029.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0029.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0029.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0030.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0030.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0030.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0030.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0030.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0030.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0030.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0030.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0031.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0031.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0031.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0031.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0031.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0031.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0031.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0031.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0032.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0032.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0032.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0032.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0032.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0032.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0032.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0032.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0033.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0033.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0033.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0033.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0033.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0033.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0033.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0033.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0034.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0034.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0034.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0034.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0034.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0034.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0034.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0034.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0035.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0035.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0035.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0035.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0035.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0035.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0035.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0035.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0036.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0036.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0036.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0036.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0036.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0036.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0036.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0036.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0037.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0037.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0037.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0037.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0037.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0037.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0037.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0037.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0038.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0038.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0038.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0038.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0038.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0038.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0038.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0038.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0039.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0039.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0039.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0039.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0039.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0039.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0039.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0039.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0040.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0040.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0040.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0040.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0040.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0040.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0040.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0040.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0041.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0041.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0041.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0041.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0041.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0041.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0041.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0041.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0042.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0042.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0042.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0042.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0042.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0042.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0042.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0042.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0043.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0043.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0043.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0043.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0043.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0043.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0043.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0043.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0044.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0044.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0044.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0044.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0044.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0044.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0044.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0044.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0045.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0045.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0045.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0045.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0045.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0045.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0045.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0045.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0046.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0046.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0046.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0046.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0046.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0046.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0046.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0046.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0047.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0047.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0047.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0047.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0047.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0047.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0047.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0047.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0048.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0048.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0048.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0048.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0048.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0048.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0048.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0048.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0049.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0049.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0049.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0049.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0049.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0049.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0049.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0049.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0050.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0050.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0050.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0050.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0050.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0050.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0050.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0050.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0051.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0051.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0051.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0051.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0051.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0051.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0051.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0051.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0052.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0052.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0052.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0052.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0052.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0052.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0052.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0052.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0053.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0053.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0053.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0053.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0053.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0053.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0053.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0053.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0054.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0054.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0054.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0054.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0054.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0054.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0054.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0054.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0055.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0055.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0055.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0055.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0055.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0055.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0055.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0055.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0056.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0056.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0056.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0056.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0056.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0056.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0056.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0056.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0057.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0057.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0057.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0057.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0057.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0057.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0057.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0057.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0058.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0058.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0058.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0058.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0058.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0058.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0058.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0058.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0059.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0059.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0059.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0059.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0059.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0059.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0059.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0059.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0060.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0060.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0060.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0060.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0060.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0060.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0060.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test7/traces/AA.S0060.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0012.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0012.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0012.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0012.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0012.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0012.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0012.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0012.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0013.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0013.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0013.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0013.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0013.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0013.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0013.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0013.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0014.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0014.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0014.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0014.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0014.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0014.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0014.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0014.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0015.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0015.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0015.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0015.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0015.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0015.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0015.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0015.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0016.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0016.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0016.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0016.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0016.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0016.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0016.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0016.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0017.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0017.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0017.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0017.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0017.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0017.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0017.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0017.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0018.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0018.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0018.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0018.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0018.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0018.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0018.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0018.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0019.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0019.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0019.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0019.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0019.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0019.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0019.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0019.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0020.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0020.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0020.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0020.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0020.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0020.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0020.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0020.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0021.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0021.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0021.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0021.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0021.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0021.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0021.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0021.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0022.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0022.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0022.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0022.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0022.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0022.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0022.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0022.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0023.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0023.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0023.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0023.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0023.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0023.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0023.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0023.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0024.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0024.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0024.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0024.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0024.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0024.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0024.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0024.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0025.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0025.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0025.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0025.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0025.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0025.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0025.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0025.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0026.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0026.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0026.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0026.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0026.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0026.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0026.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0026.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0027.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0027.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0027.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0027.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0027.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0027.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0027.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0027.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0028.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0028.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0028.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0028.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0028.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0028.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0028.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0028.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0029.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0029.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0029.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0029.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0029.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0029.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0029.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0029.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0030.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0030.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0030.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0030.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0030.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0030.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0030.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0030.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0031.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0031.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0031.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0031.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0031.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0031.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0031.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0031.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0032.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0032.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0032.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0032.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0032.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0032.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0032.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0032.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0033.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0033.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0033.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0033.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0033.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0033.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0033.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0033.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0034.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0034.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0034.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0034.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0034.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0034.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0034.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0034.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0035.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0035.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0035.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0035.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0035.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0035.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0035.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0035.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0036.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0036.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0036.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0036.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0036.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0036.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0036.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0036.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0037.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0037.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0037.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0037.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0037.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0037.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0037.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0037.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0038.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0038.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0038.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0038.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0038.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0038.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0038.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0038.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0039.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0039.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0039.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0039.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0039.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0039.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0039.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0039.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0040.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0040.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0040.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0040.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0040.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0040.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0040.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0040.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0041.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0041.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0041.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0041.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0041.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0041.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0041.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0041.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0042.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0042.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0042.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0042.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0042.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0042.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0042.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0042.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0043.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0043.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0043.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0043.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0043.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0043.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0043.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0043.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0044.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0044.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0044.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0044.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0044.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0044.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0044.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0044.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0045.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0045.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0045.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0045.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0045.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0045.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0045.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0045.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0046.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0046.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0046.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0046.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0046.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0046.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0046.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0046.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0047.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0047.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0047.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0047.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0047.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0047.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0047.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0047.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0048.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0048.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0048.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0048.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0048.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0048.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0048.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0048.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0049.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0049.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0049.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0049.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0049.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0049.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0049.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0049.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0050.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0050.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0050.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0050.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0050.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0050.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0050.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0050.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0051.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0051.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0051.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0051.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0051.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0051.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0051.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0051.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0052.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0052.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0052.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0052.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0052.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0052.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0052.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0052.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0053.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0053.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0053.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0053.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0053.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0053.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0053.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0053.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0054.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0054.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0054.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0054.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0054.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0054.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0054.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0054.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0055.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0055.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0055.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0055.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0055.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0055.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0055.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0055.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0056.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0056.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0056.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0056.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0056.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0056.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0056.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0056.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0057.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0057.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0057.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0057.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0057.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0057.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0057.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0057.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0058.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0058.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0058.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0058.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0058.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0058.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0058.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0058.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0059.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0059.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0059.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0059.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0059.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0059.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0059.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0059.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0060.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0060.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0060.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0060.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0060.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0060.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0060.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test8/traces/AA.S0060.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0001.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0002.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0003.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0004.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0005.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0006.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0007.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0008.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0009.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0010.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0011.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0012.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0013.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0014.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0015.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0016.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0017.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0018.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0019.S2.PRE.semp diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXX.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXX.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXX.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXX.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXX.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXX.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXX.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXX.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXX.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXX.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXX.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXX.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXZ.sema b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXZ.sema similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXZ.sema rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXZ.sema diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXZ.semd b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXZ.semd similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXZ.semd rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXZ.semd diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXZ.semv b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXZ.semv similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.BXZ.semv rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.BXZ.semv diff --git a/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.PRE.semp b/tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.PRE.semp similarity index 100% rename from tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.PRE.semp rename to tests/unit-tests/displacement_tests/Newmark/serial/test9/traces/AA.S0020.S2.PRE.semp