diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-dashboards.js b/telematic_system/telematic_apps/web_app/client/src/api/api-dashboards.js
index 8e2e8af8..1116780d 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-dashboards.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-dashboards.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env } from "../env"
+import { constructError } from './api-utils';
 /**
  *@brief List all dashboards urls belong to the current user organization
  */
@@ -13,9 +14,8 @@ const searchDashboards = async (org_id, search_text) => {
         data: { org_id: org_id, search_text: search_text }
       }, { withCredentials: true });
     return data;
-  } catch (err) {
-    
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
   }
 }
 
@@ -32,9 +32,8 @@ const getDashboardsByOrg = async (org_id) => {
         data: { org_id: org_id }
       }, { withCredentials: true });
     return data;
-  } catch (err) {
-    
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
  }
 }
 
@@ -51,9 +50,8 @@ const listEventDashboards = async (event_id) => {
         data: { event_id: event_id }
       }, { withCredentials: true });
     return data;
-  } catch (err) {
-    
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
   }
 }
 
@@ -71,9 +69,8 @@ const updateEventDashboards = async (event_id, dashboard_id) => {
         data: { event_id: event_id, dashboard_id: dashboard_id }
       }, { withCredentials: true });
     return data;
-  } catch (err) {
-    
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
   }
 }
 
@@ -88,9 +85,8 @@ const deleteEventDashboards = async (event_id, dashboard_id) => {
   try {
     const { data } = await axios.delete(URL+"?event_id="+event_id+"&dashboard_id="+dashboard_id, { withCredentials: true });
     return data;
-  } catch (err) {
-    
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
   }
 }
 
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-default-event-topics.js b/telematic_system/telematic_apps/web_app/client/src/api/api-default-event-topics.js
index 6c175219..b979b201 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-default-event-topics.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-default-event-topics.js
@@ -1,6 +1,7 @@
 
 import axios, { CanceledError } from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 /**
  *@brief Save the default topics setting for the given list of event and unit combinations
  * @Param The list of events and units combinations
@@ -24,7 +25,7 @@ const createDefaultTopicsByEventUnits = async (seletedUnitsTopics, user_id) => {
     return data;
   } catch (err) {
     
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+    return constructError(err)
   }
 }
 
@@ -52,7 +53,7 @@ const findAllDefaultTopicsByEventUnits = async (event_id, selectedUnitIdentifier
     return data;
   } catch (err) {
     
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+    return constructError(err)
   }
 }
 
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-events.js b/telematic_system/telematic_apps/web_app/client/src/api/api-events.js
index dd9fc116..26acca1f 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-events.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-events.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 /**
  *@brief Create an event in database (DB)
@@ -13,7 +14,7 @@ const createEvent = async (event) => {
         return data;
     } catch (err) {
         
-        return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+        return constructError(err)
     }
 }
 
@@ -38,7 +39,7 @@ const findAllEvents = async (criteria) => {
         return data;
     } catch (err) {
         
-        return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+        return constructError(err)
     }
 }
 
@@ -55,7 +56,7 @@ const editEvent = async (event) => {
         return data;
     } catch (err) {
         
-        return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+        return constructError(err)
     }
 }
 
@@ -71,7 +72,7 @@ const assignUnit2Event = async (assign_event_unit) => {
         return data;
     } catch (err) {
         
-        return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+        return constructError(err)
     }
 }
 
@@ -87,7 +88,7 @@ const unAssignUnit2Event = async (event_unit) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -104,7 +105,7 @@ const deleteEvent = async (id) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-locations.js b/telematic_system/telematic_apps/web_app/client/src/api/api-locations.js
index 14cbcfca..89c0cf9f 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-locations.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-locations.js
@@ -1,6 +1,7 @@
 
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 /**
  *@brief Create a location
@@ -14,7 +15,7 @@ const createLocation = async (location) => {
     return data;
   } catch (err) {
     
-      return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+      return constructError(err)
   
   }
 }
@@ -30,7 +31,7 @@ const findAllLocations = async () => {
     return data;
   } catch (err) {
     
-      return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+      return constructError(err)
   
   }
 }
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-org.js b/telematic_system/telematic_apps/web_app/client/src/api/api-org.js
index 85313303..f6ffa102 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-org.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-org.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 const listOrgs = async () => {
     const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/org/all`
     try {
@@ -7,7 +8,7 @@ const listOrgs = async () => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -19,7 +20,7 @@ const listOrgUsers = async () => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -34,7 +35,7 @@ const addOrgUser = async (reqData) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -48,7 +49,7 @@ const getUserRole = async (reqData) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -64,7 +65,7 @@ const getOrgsByUser = async (userId) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -79,7 +80,7 @@ const updateOrgUser = async (reqData) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -94,7 +95,7 @@ const deleteOrgUser = async (req) => {
         const { data } = await axios.delete(URL + "?org_id=" + req.org_id + "&user_id=" + req.user_id, { withCredentials: true });
         return data;
     } catch (err) {        
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-ROS2-Rosbag.js b/telematic_system/telematic_apps/web_app/client/src/api/api-ros2-rosbag.js
similarity index 71%
rename from telematic_system/telematic_apps/web_app/client/src/api/api-ROS2-Rosbag.js
rename to telematic_system/telematic_apps/web_app/client/src/api/api-ros2-rosbag.js
index db17fd04..ad635718 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-ROS2-Rosbag.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-ros2-rosbag.js
@@ -1,5 +1,6 @@
 import axios from "axios";
 import { env } from "../env";
+import { constructError } from "./api-utils";
 const listROS2Rosbags = async () => {
   const URL = `${env.REACT_APP_FILE_UPLOAD_WEB_SERVER_URI}/api/upload/list/all`;
   try {
@@ -19,7 +20,6 @@ const updateROS2RosbagDescription = async (UpdatedFileInfo) => {
     const { data } = await axios.post(URL, formData);
     return data;
   } catch (err) {
-    console.log(err);
     return constructError(err);
   }
 };
@@ -42,7 +42,6 @@ const uploadROS2Rosbags = async (ROS2RosbagsFormData) => {
   const URL = `${env.REACT_APP_FILE_UPLOAD_WEB_SERVER_URI}/api/upload`;
   try {
     const { data } = await axios.post(URL, formData, config);
-    console.log(data);
     return data;
   } catch (err) {
     return constructError(err);
@@ -62,35 +61,6 @@ const sendROS2RosbagProcessRequest = async (fileInfo) => {
   }
 };
 
-const constructError = (err) => {
-  let error = {};
-  error["errCode"] = err.response !== undefined ? err.response.status : "";
-  let errMsg = "";
-
-  errMsg =
-    err.response !== undefined && err.response.statusText !== undefined
-      ? err.response.statusText
-      : errMsg;
-
-  errMsg = err.message !== undefined ? err.message : errMsg;
-
-  errMsg =
-    err.response !== undefined &&
-    err.response.data !== undefined &&
-    err.response.data.message !== undefined
-      ? err.response.data.message
-      : errMsg;
-
-  errMsg =
-    err.response !== undefined &&
-    err.response.data !== undefined &&
-    err.response.data.error !== undefined
-      ? err.response.data.error
-      : errMsg;
-
-  error["errMsg"] = errMsg;
-  return error;
-};
 
 export {
   listROS2Rosbags,
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-states.js b/telematic_system/telematic_apps/web_app/client/src/api/api-states.js
index 89c7fd27..1b61666f 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-states.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-states.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 /**
  *@brief Find all states in the US
@@ -12,7 +13,7 @@ const findAllStates = async () => {
     return data;
   } catch (err) {
     
-    return { errCode:  err.response!==undefined && err.response.status !== undefined && err.response.status, errMsg:  err.response !==undefined && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !==undefined ? err.response.statusText :"")}
+    return constructError(err)
   }
 }
 
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-testing-types.js b/telematic_system/telematic_apps/web_app/client/src/api/api-testing-types.js
index 462aded3..2802f757 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-testing-types.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-testing-types.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 /**
  *@brief Find all testing types
@@ -12,7 +13,7 @@ const findAllTestingTypes= async (criteria) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-units.js b/telematic_system/telematic_apps/web_app/client/src/api/api-units.js
index b27887b2..85a24210 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-units.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-units.js
@@ -1,6 +1,7 @@
 
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 /**
  *@brief Create a unit
  * @Return Response status and message
@@ -12,7 +13,7 @@ const createUnit = async (unit) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 };
@@ -28,7 +29,7 @@ const findAllUnits = async () => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 };
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-user.js b/telematic_system/telematic_apps/web_app/client/src/api/api-user.js
index d748e591..a22fd370 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/api-user.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-user.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 const registerNewUser = async (username, email, password, org_id) => {
     const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/users/register`
@@ -14,7 +15,7 @@ const registerNewUser = async (username, email, password, org_id) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -30,7 +31,7 @@ const updatePassword = async (username, email, new_password) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -63,7 +64,7 @@ const deleteUser = async (username) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -77,7 +78,7 @@ const listUsers = async () => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
@@ -88,7 +89,7 @@ const updateUserServerAdmin = async (req) => {
         return data;
     } catch (err) {
         
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
   
     }
 }
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-utils.js b/telematic_system/telematic_apps/web_app/client/src/api/api-utils.js
new file mode 100644
index 00000000..1e4552f0
--- /dev/null
+++ b/telematic_system/telematic_apps/web_app/client/src/api/api-utils.js
@@ -0,0 +1,31 @@
+const constructError = (err) => {
+  let error = {};
+  error["errCode"] = err.response !== undefined ? err.response.status : "";
+  let errMsg = "";
+
+  errMsg =
+    err.response !== undefined && err.response.statusText !== undefined
+      ? err.response.statusText
+      : errMsg;
+
+  errMsg = err.message !== undefined ? err.message : errMsg;
+
+  errMsg =
+    err.response !== undefined &&
+    err.response.data !== undefined &&
+    err.response.data.message !== undefined
+      ? err.response.data.message
+      : errMsg;
+
+  errMsg =
+    err.response !== undefined &&
+    err.response.data !== undefined &&
+    err.response.data.error !== undefined
+      ? err.response.data.error
+      : errMsg;
+
+  error["errMsg"] = errMsg;
+  return error;
+};
+
+export { constructError };
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/user_topic_request.js b/telematic_system/telematic_apps/web_app/client/src/api/user-topic-request.js
similarity index 74%
rename from telematic_system/telematic_apps/web_app/client/src/api/user_topic_request.js
rename to telematic_system/telematic_apps/web_app/client/src/api/user-topic-request.js
index 700ace44..3d913c4c 100644
--- a/telematic_system/telematic_apps/web_app/client/src/api/user_topic_request.js
+++ b/telematic_system/telematic_apps/web_app/client/src/api/user-topic-request.js
@@ -7,7 +7,7 @@ import {env} from "../env"
  * @Return Response status and save a bulk of topics for each event and unit combination
  */
 const upsertUserTopicRequestForEventUnits = async (seletedUnitsTopics, user_id) => {
-  const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/user_topic_request/upsert`
+  const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/user-topic-request/upsert`
   let event_id = 0;
   let unit_identifiers = [];
   seletedUnitsTopics.forEach(element => {
@@ -24,7 +24,7 @@ const upsertUserTopicRequestForEventUnits = async (seletedUnitsTopics, user_id)
     return data;
   } catch (err) {
     
-      return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+      return constructError(err)
   
   }
 }
@@ -37,7 +37,7 @@ const upsertUserTopicRequestForEventUnits = async (seletedUnitsTopics, user_id)
  * @Return Response status and load a bulk of topics for each event and list of units for the event
  */
 const findUsersTopicRequestByEventUnits = async (event_id, selectedUnitIdentifiers, exclude_user_id) => {
-  const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/user_topic_request/all`
+  const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/user-topic-request/all`
   if (selectedUnitIdentifiers.length === 0 || event_id === 0 || event_id === undefined) {
     return { errCode: CanceledError.ERR_BAD_REQUEST, errMsg: "Event id or units cannot be empty" };
   }
@@ -54,7 +54,7 @@ const findUsersTopicRequestByEventUnits = async (event_id, selectedUnitIdentifie
     return data;
   } catch (err) {
     
-      return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+      return constructError(err)
   
   }
 }
@@ -67,7 +67,7 @@ const findUsersTopicRequestByEventUnits = async (event_id, selectedUnitIdentifie
  * @Return Response status and load a bulk of topics for each event and list of units for the event
  */
  const findUserTopicRequestByUserEventUnits = async (event_id, selectedUnitIdentifiers, user_id) => {
-  const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/user_topic_request/user/list`
+  const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/user-topic-request/user/list`
   if (selectedUnitIdentifiers.length === 0 || event_id === 0 || event_id === undefined) {
     return { errCode: CanceledError.ERR_BAD_REQUEST, errMsg: "Event id or units cannot be empty" };
   }
@@ -84,7 +84,7 @@ const findUsersTopicRequestByEventUnits = async (event_id, selectedUnitIdentifie
     return data;
   } catch (err) {
     
-      return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+      return constructError(err)
   
   }
 }
diff --git a/telematic_system/telematic_apps/web_app/client/src/components/layout/NavMenu.js b/telematic_system/telematic_apps/web_app/client/src/components/layout/NavMenu.js
index a84791f0..c28d0617 100644
--- a/telematic_system/telematic_apps/web_app/client/src/components/layout/NavMenu.js
+++ b/telematic_system/telematic_apps/web_app/client/src/components/layout/NavMenu.js
@@ -159,7 +159,7 @@ const NavMenu = React.memo(() => {
                     </ListItem>
                     }
                 </List>
-                <StyledListItemButton onClick={logoutHandler} sx={{
+                <StyledListItemButton title="Logout" onClick={logoutHandler} sx={{
                     position: "absolute",
                     bottom: 20,
                     right: 0,
diff --git a/telematic_system/telematic_apps/web_app/client/src/components/topics/TopicList.js b/telematic_system/telematic_apps/web_app/client/src/components/topics/TopicList.js
index add51d75..b3a2b620 100644
--- a/telematic_system/telematic_apps/web_app/client/src/components/topics/TopicList.js
+++ b/telematic_system/telematic_apps/web_app/client/src/components/topics/TopicList.js
@@ -16,11 +16,12 @@
  */
 import { Card, CardContent, CardHeader, Grid } from '@mui/material';
 import React, { useContext, useEffect, useState } from 'react';
-import { findUserTopicRequestByUserEventUnits } from '../../api/user_topic_request';
+import { findUserTopicRequestByUserEventUnits } from '../../api/user-topic-request';
 import AuthContext from '../../context/auth-context';
 import TopicContext from '../../context/topic-context';
 import { CustomizedButton } from '../ui/CustomizedButton';
 import TopicListPerUnit from './TopicListPerUnit';
+import { CustomizedOutlinedButton } from '../ui/CustomizedOutlinedButton';
 
 const TopicList = React.memo((props) => {
     const [selectedUnits, setSelectedUnits] = useState([]);
@@ -308,22 +309,22 @@ const TopicList = React.memo((props) => {
             </Grid>
             <Grid item xs={2} sx={{ textAlign: 'center', margin: 'auto' }}>
                 
-                <CustomizedButton title="Move all available topics" key="selectedTopics" onClick={addSelectedTopicsHandler}>
+                <CustomizedOutlinedButton title="Move all available topics" key="selectedTopics" onClick={addSelectedTopicsHandler}>
                     &gt;&gt;
-                </CustomizedButton>
+                </CustomizedOutlinedButton>
                 <br />
-                <CustomizedButton title="Move all available topics" key="selectedAllTopics" onClick={selectAllTopicsHandler}>
+                <CustomizedOutlinedButton title="Move all available topics" key="selectedAllTopics" onClick={selectAllTopicsHandler}>
                     &gt;&gt;&gt;
-                </CustomizedButton>
+                </CustomizedOutlinedButton>
                 <br />
                 <br />
-                <CustomizedButton title="remove move checked selected topics"  key="removeSelectedTopics" onClick={removeSelectedTopicsHandler}>
+                <CustomizedOutlinedButton title="remove move checked selected topics"  key="removeSelectedTopics" onClick={removeSelectedTopicsHandler}>
                     &lt;&lt;
-                </CustomizedButton>
+                </CustomizedOutlinedButton>
                 <br />
-                <CustomizedButton title="Move checked selected topics" key="MoveSelectedTopics" onClick={unSelectAllTopicsHandler}>
+                <CustomizedOutlinedButton title="Move checked selected topics" key="MoveSelectedTopics" onClick={unSelectAllTopicsHandler}>
                     &lt;&lt;&lt;
-                </CustomizedButton>
+                </CustomizedOutlinedButton>
                 <br />
             </Grid>
             <Grid item xs={5}>
diff --git a/telematic_system/telematic_apps/web_app/client/src/components/topics/UnitTopicList.js b/telematic_system/telematic_apps/web_app/client/src/components/topics/UnitTopicList.js
index dc0fb5d0..0fedf488 100644
--- a/telematic_system/telematic_apps/web_app/client/src/components/topics/UnitTopicList.js
+++ b/telematic_system/telematic_apps/web_app/client/src/components/topics/UnitTopicList.js
@@ -232,7 +232,6 @@ const UnitTopicList = React.memo((props) => {
     }, [props]);
 
     return (
-        <React.Fragment>
             <Grid container item xs={6} >
                 <Box sx={{ width: '100%' }}>
                     <Card>
@@ -281,7 +280,6 @@ const UnitTopicList = React.memo((props) => {
                     </Card>
                 </Box>
             </Grid>
-        </React.Fragment>
     )
 });
 
diff --git a/telematic_system/telematic_apps/web_app/client/src/components/users/admin/UserOrgRoleEditDialog.js b/telematic_system/telematic_apps/web_app/client/src/components/users/admin/UserOrgRoleEditDialog.js
index 700fd28d..3363582f 100644
--- a/telematic_system/telematic_apps/web_app/client/src/components/users/admin/UserOrgRoleEditDialog.js
+++ b/telematic_system/telematic_apps/web_app/client/src/components/users/admin/UserOrgRoleEditDialog.js
@@ -222,7 +222,7 @@ const UserOrgRoleEditDialog = (props) => {
                                                 <ToggleButton value="y" aria-label="Change aligned" data-testid='confirm-change-to-admin-toggle-btn'>
                                                     Change
                                                 </ToggleButton>
-                                                <ToggleButton value="n" aria-label="Cancel aligned">
+                                                <ToggleButton value="n"  data-testid='cancel-admin-toggle-btn'  aria-label="Cancel aligned">
                                                     Cancel
                                                 </ToggleButton>
                                             </ToggleButtonGroup>
diff --git a/telematic_system/telematic_apps/web_app/client/src/components/users/admin/UserTableRow.js b/telematic_system/telematic_apps/web_app/client/src/components/users/admin/UserTableRow.js
index 4ae69e30..a22d5327 100644
--- a/telematic_system/telematic_apps/web_app/client/src/components/users/admin/UserTableRow.js
+++ b/telematic_system/telematic_apps/web_app/client/src/components/users/admin/UserTableRow.js
@@ -154,7 +154,7 @@ const UserTableRow = (props) => {
                     })
                 }
                 <TableCell key={`user-table-row-actions-${props.userRow.id}`}>
-                    <CustomizedButton  key={`user-table-row-control-${props.userRow.id}`} title="Update user organizations and roles" onClick={handleOpen}>
+                    <CustomizedButton data-testid = {`user-table-open-btn-${props.userRow.id}`} key={`user-table-row-control-${props.userRow.id}`} title="Update user organizations and roles" onClick={handleOpen}>
                         <AssignmentIndIcon />
                     </CustomizedButton>
                 </TableCell>
diff --git a/telematic_system/telematic_apps/web_app/client/src/pages/ROS2RosbagPage.js b/telematic_system/telematic_apps/web_app/client/src/pages/ROS2RosbagPage.js
index 944aa80c..2ff2ab83 100644
--- a/telematic_system/telematic_apps/web_app/client/src/pages/ROS2RosbagPage.js
+++ b/telematic_system/telematic_apps/web_app/client/src/pages/ROS2RosbagPage.js
@@ -21,7 +21,7 @@ import {
   sendROS2RosbagProcessRequest,
   updateROS2RosbagDescription,
   uploadROS2Rosbags,
-} from "../api/api-ROS2-Rosbag";
+} from "../api/api-ros2-rosbag";
 import ROS2ROSBagFilter from "../components/ros2_rosbag/ROS2ROSBagFilter";
 import {
   PROCESSING_STATUS,
diff --git a/telematic_system/telematic_apps/web_app/client/src/pages/TopicPage.js b/telematic_system/telematic_apps/web_app/client/src/pages/TopicPage.js
index 9d1178ba..ea1f9c9e 100644
--- a/telematic_system/telematic_apps/web_app/client/src/pages/TopicPage.js
+++ b/telematic_system/telematic_apps/web_app/client/src/pages/TopicPage.js
@@ -20,7 +20,7 @@ import { findAllEvents } from '../api/api-events';
 import { findAllLocations } from '../api/api-locations';
 import { findAllTestingTypes } from '../api/api-testing-types';
 import { requestSelectedLiveUnitsTopics } from '../api/api-topics';
-import { findUsersTopicRequestByEventUnits, upsertUserTopicRequestForEventUnits } from '../api/user_topic_request';
+import { findUsersTopicRequestByEventUnits, upsertUserTopicRequestForEventUnits } from '../api/user-topic-request';
 import { VALID_UNIT_TYPES } from '../components/events/EventMetadata';
 import InfrastructureTopicList from '../components/topics/InfrastructureTopicList';
 import { NOTIFICATION_STATUS } from '../components/topics/TopicMetadata';
diff --git a/telematic_system/telematic_apps/web_app/client/src/tests/api/user_topic_request.test.js b/telematic_system/telematic_apps/web_app/client/src/tests/api/user_topic_request.test.js
index 30ce428c..6221f4c1 100644
--- a/telematic_system/telematic_apps/web_app/client/src/tests/api/user_topic_request.test.js
+++ b/telematic_system/telematic_apps/web_app/client/src/tests/api/user_topic_request.test.js
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { expect, test } from '@jest/globals';
-import { upsertUserTopicRequestForEventUnits, findUserTopicRequestByUserEventUnits, findUsersTopicRequestByEventUnits } from '../../api/user_topic_request';
+import { upsertUserTopicRequestForEventUnits, findUserTopicRequestByUserEventUnits, findUsersTopicRequestByEventUnits } from '../../api/user-topic-request';
 
 jest.mock('axios');
 
diff --git a/telematic_system/telematic_apps/web_app/client/src/tests/components/Layout.test.js b/telematic_system/telematic_apps/web_app/client/src/tests/components/Layout.test.js
index 94c1e606..001df505 100644
--- a/telematic_system/telematic_apps/web_app/client/src/tests/components/Layout.test.js
+++ b/telematic_system/telematic_apps/web_app/client/src/tests/components/Layout.test.js
@@ -32,7 +32,7 @@ test("Test Layout", async () => {
   });
 
   await waitFor(() => {
-    expect(screen.getByText("Events")).toBeInTheDocument();
+    expect(screen.getByText("Telematic")).toBeInTheDocument();
   });
 
   await act(async() => {
diff --git a/telematic_system/telematic_apps/web_app/client/src/tests/components/NavMenu.test.js b/telematic_system/telematic_apps/web_app/client/src/tests/components/NavMenu.test.js
index eb50ff87..fcfa890c 100644
--- a/telematic_system/telematic_apps/web_app/client/src/tests/components/NavMenu.test.js
+++ b/telematic_system/telematic_apps/web_app/client/src/tests/components/NavMenu.test.js
@@ -32,6 +32,6 @@ test("Test NavMenu checkServerSession", async () => {
   });
 
   await waitFor(() => {
-    expect(screen.getByText("Events")).toBeInTheDocument();
+    expect(screen.getByTitle('Logout')).toBeInTheDocument();
 });
 });
diff --git a/telematic_system/telematic_apps/web_app/client/src/tests/pages/AdminPage.test.js b/telematic_system/telematic_apps/web_app/client/src/tests/pages/AdminPage.test.js
index cd26cc14..e7e484ef 100644
--- a/telematic_system/telematic_apps/web_app/client/src/tests/pages/AdminPage.test.js
+++ b/telematic_system/telematic_apps/web_app/client/src/tests/pages/AdminPage.test.js
@@ -69,7 +69,7 @@ test('Admin page', async () => {
     })
 
     fireEvent.click(screen.getByTestId('confirm-change-to-admin-toggle-btn'));
-    fireEvent.click(screen.getByRole('button', { name: 'Close' }));
+    fireEvent.click(screen.getByTestId('close-assign-user-to-org', { name: 'Close' }));
 });
 
 afterEach(() => {
diff --git a/telematic_system/telematic_apps/web_app/client/src/tests/pages/ROS2RosbagPage.test.js b/telematic_system/telematic_apps/web_app/client/src/tests/pages/ROS2RosbagPage.test.js
index a375339c..9a0d34c9 100644
--- a/telematic_system/telematic_apps/web_app/client/src/tests/pages/ROS2RosbagPage.test.js
+++ b/telematic_system/telematic_apps/web_app/client/src/tests/pages/ROS2RosbagPage.test.js
@@ -2,13 +2,12 @@ import { expect, jest, test } from "@jest/globals";
 import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import React from "react";
 import { act } from "react-dom/test-utils";
-import * as ROS2RosbagApi from "../../api/api-ROS2-Rosbag";
-import AuthContext from "../../context/auth-context";
-import AdminPage from "../../pages/AdminPage";
-import ROS2RosbagContext from "../../context/ROS2-rosbag-context";
-import ROS2RosbagPage from "../../pages/ROS2RosbagPage";
+import * as ROS2RosbagApi from "../../api/api-ros2-rosbag";
 import ROS2RosbagUploadDialog from "../../components/ros2_rosbag/ROS2RosbagUploadDialog";
 import ROS2RosbagUploadPreviewTableRow from "../../components/ros2_rosbag/ROS2RosbagUploadPreviewTableRow";
+import ROS2RosbagContext from "../../context/ROS2-rosbag-context";
+import AuthContext from "../../context/auth-context";
+import ROS2RosbagPage from "../../pages/ROS2RosbagPage";
 
 test("ROS2 Rosbag page", async () => {
   const ROS2RosbagList = [
@@ -57,7 +56,7 @@ test("ROS2 Rosbag page", async () => {
   ];
 
   jest
-    .spyOn(ROS2RosbagApi, "listRos2Rosbags")
+    .spyOn(ROS2RosbagApi, "listROS2Rosbags")
     .mockResolvedValue(ROS2RosbagList);
 
   await act(async () => {