diff --git a/tests/testPlainVariableCreation.conf b/tests/serverTestPlainVariableCreation.conf
similarity index 100%
rename from tests/testPlainVariableCreation.conf
rename to tests/serverTestPlainVariableCreation.conf
diff --git a/tests/testRenameImport-DoocsVariableConfig.xml b/tests/serverTestRenameImport-DoocsVariableConfig.xml
similarity index 100%
rename from tests/testRenameImport-DoocsVariableConfig.xml
rename to tests/serverTestRenameImport-DoocsVariableConfig.xml
diff --git a/tests/testRenameImport.conf b/tests/serverTestRenameImport.conf
similarity index 100%
rename from tests/testRenameImport.conf
rename to tests/serverTestRenameImport.conf
diff --git a/tests/src/testPlainVariableCreation.cpp b/tests/src/serverTestPlainVariableCreation.cpp
similarity index 95%
rename from tests/src/testPlainVariableCreation.cpp
rename to tests/src/serverTestPlainVariableCreation.cpp
index 93321beb1271a4682097fe4e93e2e6977b0f292e..961fce1512f67033433dc71f7d448c67e3f58b19 100644
--- a/tests/src/testPlainVariableCreation.cpp
+++ b/tests/src/serverTestPlainVariableCreation.cpp
@@ -7,7 +7,7 @@
 #include <doocs-server-test-helper/doocsServerTestHelper.h>
 #include <thread>
 
-ReferenceTestApplication referenceTestApplication("testPlainVariableCreation");
+ReferenceTestApplication referenceTestApplication("serverTestPlainVariableCreation");
 
 // declare that we have some thing like a doocs server. is is linked from the doocs lib, but there is no header.
 extern int eq_server(int, char **);
@@ -62,6 +62,6 @@ protected:
 test_suite*
 init_unit_test_suite( int argc, char* argv[] )
 {
-  framework::master_test_suite().p_name.value = "PlainVariableCreation test suite";
+  framework::master_test_suite().p_name.value = "PlainVariableCreation server test suite";
   return new PlainVariableCreationTestSuite(argc, argv);
 }
diff --git a/tests/src/testRenameImport.cpp b/tests/src/serverTestRenameImport.cpp
similarity index 84%
rename from tests/src/testRenameImport.cpp
rename to tests/src/serverTestRenameImport.cpp
index 9ffca34b1c44ea3c70f8ff703c2fb431fb16023c..69e7cac952a13763ec7fc80261d2d33062c1cfb7 100644
--- a/tests/src/testRenameImport.cpp
+++ b/tests/src/serverTestRenameImport.cpp
@@ -7,7 +7,7 @@
 #include <doocs-server-test-helper/doocsServerTestHelper.h>
 #include <thread>
 
-ReferenceTestApplication referenceTestApplication("testRenameImport");
+ReferenceTestApplication referenceTestApplication("serverTestRenameImport");
 
 // declare that we have some thing like a doocs server. is is linked from the doocs lib, but there is no header.
 extern int eq_server(int, char **);
@@ -45,7 +45,7 @@ void testVariableExistence(){
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGetArray<int>("//DOUBLE/CONSTANT_ARRAY") );
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGetArray<int>("//DOUBLE/FROM_DEVICE_ARRAY") );
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGetArray<int>("//DOUBLE/TO_DEVICE_ARRAY") );
-  BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGet<int>("//DOUBLE/RENAMED_CONSTANT") );
+  BOOST_CHECK( DoocsServerTestHelper::doocsGet<double>("//DOUBLE/RENAMED_CONSTANT") == 1./8.);
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGet<int>("//DOUBLE/FROM_DEVICE_SCALAR") );
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGet<int>("//DOUBLE/DOUBLE.TO_DEVICE_SCALAR") );
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGet<int>("//DOUBLE/I_AM_A_FLOAT_SCALAR") );
@@ -53,15 +53,15 @@ void testVariableExistence(){
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGetArray<int>("//FLOAT/CONSTANT_ARRAY") );
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGetArray<int>("//FLOAT/FROM_DEVICE_ARRAY") );
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGetArray<int>("//FLOAT/TO_DEVICE_ARRAY") );
-  BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGet<int>("//FLOAT/DATA_TYPE_CONSTANT") );
+  BOOST_CHECK( DoocsServerTestHelper::doocsGet<float>("//FLOAT/DATA_TYPE_CONSTANT") == 1./4.);
   BOOST_CHECK_NO_THROW( DoocsServerTestHelper::doocsGet<int>("//FLOAT/FROM_DEVICE_SCALAR") );
 }
 
 // due to the doocs server thread you can only have one test suite
-class RenameImportTestSuite : public test_suite {
+class RenameImportServerTestSuite : public test_suite {
 public:
-  RenameImportTestSuite(int argc, char* argv[])
-    : test_suite("RenameImport test suite") ,
+  RenameImportServerTestSuite(int argc, char* argv[])
+    : test_suite("RenameImport server test suite") ,
       doocsServerThread(eq_server, argc, argv)
   {
     doocsServerThread.detach();
@@ -75,6 +75,6 @@ protected:
 test_suite*
 init_unit_test_suite( int argc, char* argv[] )
 {
-  framework::master_test_suite().p_name.value = "RenameImport test suite";
-  return new RenameImportTestSuite(argc, argv);
+  framework::master_test_suite().p_name.value = "RenameImport server test suite";
+  return new RenameImportServerTestSuite(argc, argv);
 }