diff --git a/fem/tests/KeywordHandleTimer/CMakeLists.txt b/fem/tests/KeywordCompare/CMakeLists.txt
similarity index 100%
rename from fem/tests/KeywordHandleTimer/CMakeLists.txt
rename to fem/tests/KeywordCompare/CMakeLists.txt
diff --git a/fem/tests/KeywordHandleTimer/ELMERSOLVER_STARTINFO b/fem/tests/KeywordCompare/ELMERSOLVER_STARTINFO
similarity index 100%
rename from fem/tests/KeywordHandleTimer/ELMERSOLVER_STARTINFO
rename to fem/tests/KeywordCompare/ELMERSOLVER_STARTINFO
diff --git a/fem/tests/KeywordHandleTimer/KeywordCompare.F90 b/fem/tests/KeywordCompare/KeywordCompare.F90
similarity index 100%
rename from fem/tests/KeywordHandleTimer/KeywordCompare.F90
rename to fem/tests/KeywordCompare/KeywordCompare.F90
diff --git a/fem/tests/KeywordHandleTimer/case.sif b/fem/tests/KeywordCompare/case.sif
similarity index 100%
rename from fem/tests/KeywordHandleTimer/case.sif
rename to fem/tests/KeywordCompare/case.sif
diff --git a/fem/tests/KeywordHandleTimer/runtest.cmake b/fem/tests/KeywordCompare/runtest.cmake
similarity index 100%
rename from fem/tests/KeywordHandleTimer/runtest.cmake
rename to fem/tests/KeywordCompare/runtest.cmake
diff --git a/fem/tests/KeywordHandleTimer/square.grd b/fem/tests/KeywordCompare/square.grd
similarity index 100%
rename from fem/tests/KeywordHandleTimer/square.grd
rename to fem/tests/KeywordCompare/square.grd
diff --git a/fem/tests/KeywordHandleTimer2/CMakeLists.txt b/fem/tests/KeywordCompare2/CMakeLists.txt
similarity index 100%
rename from fem/tests/KeywordHandleTimer2/CMakeLists.txt
rename to fem/tests/KeywordCompare2/CMakeLists.txt
diff --git a/fem/tests/KeywordHandleTimer2/ELMERSOLVER_STARTINFO b/fem/tests/KeywordCompare2/ELMERSOLVER_STARTINFO
similarity index 100%
rename from fem/tests/KeywordHandleTimer2/ELMERSOLVER_STARTINFO
rename to fem/tests/KeywordCompare2/ELMERSOLVER_STARTINFO
diff --git a/fem/tests/KeywordHandleTimer2/KeywordCompareReal.F90 b/fem/tests/KeywordCompare2/KeywordCompareReal.F90
similarity index 100%
rename from fem/tests/KeywordHandleTimer2/KeywordCompareReal.F90
rename to fem/tests/KeywordCompare2/KeywordCompareReal.F90
diff --git a/fem/tests/KeywordHandleTimer2/RealFunctionTests.F90 b/fem/tests/KeywordCompare2/RealFunctionTests.F90
similarity index 100%
rename from fem/tests/KeywordHandleTimer2/RealFunctionTests.F90
rename to fem/tests/KeywordCompare2/RealFunctionTests.F90
diff --git a/fem/tests/KeywordHandleTimer2/case.sif b/fem/tests/KeywordCompare2/case.sif
similarity index 100%
rename from fem/tests/KeywordHandleTimer2/case.sif
rename to fem/tests/KeywordCompare2/case.sif
diff --git a/fem/tests/KeywordHandleTimer2/runtest.cmake b/fem/tests/KeywordCompare2/runtest.cmake
similarity index 100%
rename from fem/tests/KeywordHandleTimer2/runtest.cmake
rename to fem/tests/KeywordCompare2/runtest.cmake
diff --git a/fem/tests/KeywordHandleTimer2/square.grd b/fem/tests/KeywordCompare2/square.grd
similarity index 100%
rename from fem/tests/KeywordHandleTimer2/square.grd
rename to fem/tests/KeywordCompare2/square.grd
diff --git a/fem/tests/KeywordHandleTimer3/CMakeLists.txt b/fem/tests/KeywordCompare3/CMakeLists.txt
similarity index 100%
rename from fem/tests/KeywordHandleTimer3/CMakeLists.txt
rename to fem/tests/KeywordCompare3/CMakeLists.txt
diff --git a/fem/tests/KeywordHandleTimer3/ELMERSOLVER_STARTINFO b/fem/tests/KeywordCompare3/ELMERSOLVER_STARTINFO
similarity index 100%
rename from fem/tests/KeywordHandleTimer3/ELMERSOLVER_STARTINFO
rename to fem/tests/KeywordCompare3/ELMERSOLVER_STARTINFO
diff --git a/fem/tests/KeywordHandleTimer3/KeywordCompareRealVec.F90 b/fem/tests/KeywordCompare3/KeywordCompareRealVec.F90
similarity index 100%
rename from fem/tests/KeywordHandleTimer3/KeywordCompareRealVec.F90
rename to fem/tests/KeywordCompare3/KeywordCompareRealVec.F90
diff --git a/fem/tests/KeywordHandleTimer3/RealVecFunctionTests.F90 b/fem/tests/KeywordCompare3/RealVecFunctionTests.F90
similarity index 100%
rename from fem/tests/KeywordHandleTimer3/RealVecFunctionTests.F90
rename to fem/tests/KeywordCompare3/RealVecFunctionTests.F90
diff --git a/fem/tests/KeywordHandleTimer3/case.sif b/fem/tests/KeywordCompare3/case.sif
similarity index 100%
rename from fem/tests/KeywordHandleTimer3/case.sif
rename to fem/tests/KeywordCompare3/case.sif
diff --git a/fem/tests/KeywordHandleTimer3/runtest.cmake b/fem/tests/KeywordCompare3/runtest.cmake
similarity index 100%
rename from fem/tests/KeywordHandleTimer3/runtest.cmake
rename to fem/tests/KeywordCompare3/runtest.cmake
diff --git a/fem/tests/KeywordHandleTimer3/square.grd b/fem/tests/KeywordCompare3/square.grd
similarity index 100%
rename from fem/tests/KeywordHandleTimer3/square.grd
rename to fem/tests/KeywordCompare3/square.grd
diff --git a/fem/tests/KeywordHandleTimer4/CMakeLists.txt b/fem/tests/KeywordCompare4/CMakeLists.txt
similarity index 100%
rename from fem/tests/KeywordHandleTimer4/CMakeLists.txt
rename to fem/tests/KeywordCompare4/CMakeLists.txt
diff --git a/fem/tests/KeywordHandleTimer4/ELMERSOLVER_STARTINFO b/fem/tests/KeywordCompare4/ELMERSOLVER_STARTINFO
similarity index 100%
rename from fem/tests/KeywordHandleTimer4/ELMERSOLVER_STARTINFO
rename to fem/tests/KeywordCompare4/ELMERSOLVER_STARTINFO
diff --git a/fem/tests/KeywordHandleTimer4/KeywordCompareBC.F90 b/fem/tests/KeywordCompare4/KeywordCompareBC.F90
similarity index 100%
rename from fem/tests/KeywordHandleTimer4/KeywordCompareBC.F90
rename to fem/tests/KeywordCompare4/KeywordCompareBC.F90
diff --git a/fem/tests/KeywordHandleTimer4/case.sif b/fem/tests/KeywordCompare4/case.sif
similarity index 100%
rename from fem/tests/KeywordHandleTimer4/case.sif
rename to fem/tests/KeywordCompare4/case.sif
diff --git a/fem/tests/KeywordHandleTimer4/runtest.cmake b/fem/tests/KeywordCompare4/runtest.cmake
similarity index 100%
rename from fem/tests/KeywordHandleTimer4/runtest.cmake
rename to fem/tests/KeywordCompare4/runtest.cmake
diff --git a/fem/tests/KeywordHandleTimer4/square.grd b/fem/tests/KeywordCompare4/square.grd
similarity index 100%
rename from fem/tests/KeywordHandleTimer4/square.grd
rename to fem/tests/KeywordCompare4/square.grd
diff --git a/fem/tests/KeywordHandleTimer5/CMakeLists.txt b/fem/tests/KeywordCompare5/CMakeLists.txt
similarity index 100%
rename from fem/tests/KeywordHandleTimer5/CMakeLists.txt
rename to fem/tests/KeywordCompare5/CMakeLists.txt
diff --git a/fem/tests/KeywordHandleTimer5/ELMERSOLVER_STARTINFO b/fem/tests/KeywordCompare5/ELMERSOLVER_STARTINFO
similarity index 100%
rename from fem/tests/KeywordHandleTimer5/ELMERSOLVER_STARTINFO
rename to fem/tests/KeywordCompare5/ELMERSOLVER_STARTINFO
diff --git a/fem/tests/KeywordHandleTimer5/KeywordCompareTensor.F90 b/fem/tests/KeywordCompare5/KeywordCompareTensor.F90
similarity index 100%
rename from fem/tests/KeywordHandleTimer5/KeywordCompareTensor.F90
rename to fem/tests/KeywordCompare5/KeywordCompareTensor.F90
diff --git a/fem/tests/KeywordHandleTimer5/case.sif b/fem/tests/KeywordCompare5/case.sif
similarity index 100%
rename from fem/tests/KeywordHandleTimer5/case.sif
rename to fem/tests/KeywordCompare5/case.sif
diff --git a/fem/tests/KeywordHandleTimer5/runtest.cmake b/fem/tests/KeywordCompare5/runtest.cmake
similarity index 100%
rename from fem/tests/KeywordHandleTimer5/runtest.cmake
rename to fem/tests/KeywordCompare5/runtest.cmake
diff --git a/fem/tests/KeywordHandleTimer5/square.grd b/fem/tests/KeywordCompare5/square.grd
similarity index 100%
rename from fem/tests/KeywordHandleTimer5/square.grd
rename to fem/tests/KeywordCompare5/square.grd