diff --git a/examples/client/Locomotion/src/Components/StopPointsViewer/index.tsx b/examples/client/Locomotion/src/Components/StopPointsViewer/index.tsx
index d7e71cb43..1e65bf3bb 100644
--- a/examples/client/Locomotion/src/Components/StopPointsViewer/index.tsx
+++ b/examples/client/Locomotion/src/Components/StopPointsViewer/index.tsx
@@ -64,6 +64,7 @@ const StopPointsViewer = ({ goBackToAddressSelector }: StopPointsViewerProps) =>
           </StreetAddress>
         </StreetAddressContainer>
         <TouchableOpacity
+          testID="editIcon"
           onPress={() => goBackToAddressSelector(requestStopPoints.length - 1)}
         >
           <SvgIcon
diff --git a/examples/client/Locomotion/src/Components/TextInput/BottomSheetInput.js b/examples/client/Locomotion/src/Components/TextInput/BottomSheetInput.js
index f2b6fdd3c..cc467e0fc 100644
--- a/examples/client/Locomotion/src/Components/TextInput/BottomSheetInput.js
+++ b/examples/client/Locomotion/src/Components/TextInput/BottomSheetInput.js
@@ -62,6 +62,7 @@ const BottomSheetInputField = forwardRef((props, ref) => (
 
       { props.onDrag && (
       <DragTouchableIconContainer
+        testID={`DragIconContainer_${props.index}`}
         onPressIn={() => props.onDrag()}
         onPressOut={() => props.onEndDrag()}
       >
@@ -83,7 +84,7 @@ const BottomSheetInputField = forwardRef((props, ref) => (
 
     { props.remove && (
     <TouchableIconContainer width={30} marginLeft={15} onPress={() => props.remove()}>
-      <RemoveIconContainer>
+      <RemoveIconContainer testID={`removeIcon_${props.index}`}>
         <SvgIcon
           Svg={deleteIcon}
           stroke="#333"
diff --git a/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/ServiceCard/index.js b/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/ServiceCard/index.js
index e3e49d6e8..ea8f0d8de 100644
--- a/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/ServiceCard/index.js
+++ b/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/ServiceCard/index.js
@@ -24,7 +24,7 @@ import SettingsContext from '../../../../../../context/settings';
 
 const FARE_POPUP = 'farePopup';
 
-const ServiceCard = ({ service, withBorder }) => {
+const ServiceCard = ({ service, withBorder, testID }) => {
   const theme = useContext(ThemeContext);
   const {
     setChosenService, chosenService, serviceEstimations, ride,
@@ -110,6 +110,7 @@ const ServiceCard = ({ service, withBorder }) => {
   return (
     <>
       <CardContainer
+        testID={testID}
         theme={theme}
         withBorder={withBorder}
         selected={isSelected}
diff --git a/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/index.js b/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/index.js
index ce10b9057..38068dc90 100644
--- a/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/index.js
+++ b/examples/client/Locomotion/src/pages/ActiveRide/RideDrawer/RideOptions/ServiceOptions/index.js
@@ -63,7 +63,6 @@ const ServiceOptions = () => {
 
   return (
     <ServiceOptionsContainer alwaysBounceVertical={false}>
-
       { serviceEstimations?.length === 0
         ? (
           <EmptyState