diff --git a/public/components/FeatureAnywhereContextMenu/AssociatedDetectors/containers/AssociatedDetectors.tsx b/public/components/FeatureAnywhereContextMenu/AssociatedDetectors/containers/AssociatedDetectors.tsx
index 004c81d1..aaaed5dc 100644
--- a/public/components/FeatureAnywhereContextMenu/AssociatedDetectors/containers/AssociatedDetectors.tsx
+++ b/public/components/FeatureAnywhereContextMenu/AssociatedDetectors/containers/AssociatedDetectors.tsx
@@ -308,6 +308,7 @@ function AssociatedDetectors({ embeddable, closeFlyout, setMode }) {
             <EuiFlexItem grow={false}>
               <div>
                 <EuiButton
+                  data-test-subj="associateDetectorButton"
                   fill
                   iconType="link"
                   onClick={() => {
diff --git a/public/components/FeatureAnywhereContextMenu/CreateAnomalyDetector/AddAnomalyDetector.tsx b/public/components/FeatureAnywhereContextMenu/CreateAnomalyDetector/AddAnomalyDetector.tsx
index f55cc9b0..bea4cb76 100644
--- a/public/components/FeatureAnywhereContextMenu/CreateAnomalyDetector/AddAnomalyDetector.tsx
+++ b/public/components/FeatureAnywhereContextMenu/CreateAnomalyDetector/AddAnomalyDetector.tsx
@@ -566,7 +566,7 @@ function AddAnomalyDetector({
                     <EuiSpacer size="m" />
 
                     <EnhancedAccordion
-                      id="detectorDetails"
+                      id="detectorDetailsAccordion"
                       title={detectorNameFromVis}
                       isOpen={accordionsOpen.detectorDetails}
                       onToggle={() => onAccordionToggle('detectorDetails')}
@@ -671,7 +671,7 @@ function AddAnomalyDetector({
                     <EuiSpacer size="m" />
 
                     <EnhancedAccordion
-                      id="advancedConfiguration"
+                      id="advancedConfigurationAccordion"
                       title="Advanced configuration"
                       isOpen={accordionsOpen.advancedConfiguration}
                       onToggle={() =>
@@ -824,7 +824,7 @@ function AddAnomalyDetector({
                     <EuiSpacer size="m" />
 
                     <EnhancedAccordion
-                      id="modelFeatures"
+                      id="modelFeaturesAccordion"
                       title="Features"
                       isOpen={accordionsOpen.modelFeatures}
                       onToggle={() => onAccordionToggle('modelFeatures')}
@@ -896,7 +896,7 @@ function AddAnomalyDetector({
                   {mode === FLYOUT_MODES.existing ? (
                     <EuiButton
                       fill={true}
-                      data-test-subj="adAnywhereCreateDetectorButton"
+                      data-test-subj="adAnywhereAssociateDetectorButton"
                       isLoading={formikProps.isSubmitting}
                       onClick={() => handleAssociate(selectedDetector)}
                     >
diff --git a/public/components/FeatureAnywhereContextMenu/EnhancedAccordion/EnhancedAccordion.tsx b/public/components/FeatureAnywhereContextMenu/EnhancedAccordion/EnhancedAccordion.tsx
index 17075e27..b129bc20 100644
--- a/public/components/FeatureAnywhereContextMenu/EnhancedAccordion/EnhancedAccordion.tsx
+++ b/public/components/FeatureAnywhereContextMenu/EnhancedAccordion/EnhancedAccordion.tsx
@@ -51,6 +51,7 @@ const EnhancedAccordion = ({
           buttonContent={
             <div className="enhanced-accordion__title">
               <EuiTitle
+                data-test-subj="accordionTitleButton"
                 size="s"
                 onClick={onToggle}
                 role="button"
diff --git a/public/expressions/helpers.ts b/public/expressions/helpers.ts
index 4b76e0fb..298e14ba 100644
--- a/public/expressions/helpers.ts
+++ b/public/expressions/helpers.ts
@@ -74,7 +74,7 @@ export const convertAnomaliesToPointInTimeEventsVisLayer = (
 ): PointInTimeEventsVisLayer => {
   const events = anomalies.map((anomaly: AnomalyData) => {
     return {
-      timestamp: anomaly.startTime + (anomaly.endTime - anomaly.startTime) / 2,
+      timestamp: anomaly.startTime,
       metadata: {},
     };
   });
diff --git a/public/pages/DetectorConfig/containers/Features.tsx b/public/pages/DetectorConfig/containers/Features.tsx
index d5b8e455..9cdb609d 100644
--- a/public/pages/DetectorConfig/containers/Features.tsx
+++ b/public/pages/DetectorConfig/containers/Features.tsx
@@ -234,6 +234,7 @@ export const Features = (props: FeaturesProps) => {
             titleSize="s"
           >
             <EuiBasicTable
+              data-test-subj="featureTable"
               items={sortedItems}
               columns={columns}
               cellProps={getCellProps}