diff --git a/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx b/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx
index f51bc4e773..25ab3156d0 100644
--- a/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx
+++ b/plugins/splunk-on-call/src/components/Escalation/EscalationPolicy.tsx
@@ -43,7 +43,6 @@ export const EscalationPolicy = ({ users, team }: Props) => {
           });
         });
       });
-
     return users;
   });
 
diff --git a/plugins/splunk-on-call/src/components/Incident/IncidentListItem.tsx b/plugins/splunk-on-call/src/components/Incident/IncidentListItem.tsx
index 895844a483..b1108988e2 100644
--- a/plugins/splunk-on-call/src/components/Incident/IncidentListItem.tsx
+++ b/plugins/splunk-on-call/src/components/Incident/IncidentListItem.tsx
@@ -24,7 +24,6 @@ import {
   makeStyles,
   IconButton,
   Typography,
-  withStyles,
 } from '@material-ui/core';
 import DoneIcon from '@material-ui/icons/Done';
 import DoneAllIcon from '@material-ui/icons/DoneAll';
@@ -62,12 +61,6 @@ const useStyles = makeStyles({
   },
 });
 
-const ListItemWithWiderSecondaryAction = withStyles({
-  secondaryAction: {
-    paddingRight: 96,
-  },
-})(ListItem);
-
 type Props = {
   incident: Incident;
   onIncidentAction: () => void;
diff --git a/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.tsx b/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.tsx
index 93aadbc057..08b1f01704 100644
--- a/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.tsx
+++ b/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.tsx
@@ -35,7 +35,6 @@ import {
   InputLabel,
 } from '@material-ui/core';
 import Card from '@material-ui/core/Card';
-import CardActions from '@material-ui/core/CardActions';
 import CardContent from '@material-ui/core/CardContent';
 import { useApi, alertApiRef, identityApiRef } from '@backstage/core';
 import { useAsync, useAsyncFn } from 'react-use';
@@ -203,6 +202,7 @@ export const TriggerDialog = ({
                 id="user-targets"
                 multiple
                 value={userTargets}
+                inputProps={{ 'data-testid': 'trigger-select-user-target' }}
                 onChange={handleUserTargets}
                 input={<Input />}
                 renderValue={selected => (
@@ -238,6 +238,7 @@ export const TriggerDialog = ({
                 value={policyTargets}
                 onChange={handlePolicyTargets}
                 input={<Input />}
+                inputProps={{ 'data-testid': 'trigger-select-policies-target' }}
                 renderValue={selected => (
                   <div className={classes.chips}>
                     {(selected as string[]).map(value => {
@@ -277,6 +278,7 @@ export const TriggerDialog = ({
             id="multi-responder"
             value={isMultiResponder}
             onChange={isMultiResponderChanged}
+            inputProps={{ 'data-testid': 'trigger-select-behavior' }}
           >
             <MenuItem value="1">
               Stop paging after a single Acknowledge from an escalation policy
@@ -290,7 +292,7 @@ export const TriggerDialog = ({
         </FormControl>
         <TextField
           required
-          inputProps={{ 'data-testid': 'trigger-input' }}
+          inputProps={{ 'data-testid': 'trigger-summary-input' }}
           id="summary"
           multiline
           fullWidth
@@ -302,7 +304,7 @@ export const TriggerDialog = ({
         />
         <TextField
           required
-          inputProps={{ 'data-testid': 'trigger-input' }}
+          inputProps={{ 'data-testid': 'trigger-body-input' }}
           id="details"
           multiline
           fullWidth
diff --git a/plugins/splunk-on-call/src/components/types.ts b/plugins/splunk-on-call/src/components/types.ts
index 51ea17653d..b5415ac57a 100644
--- a/plugins/splunk-on-call/src/components/types.ts
+++ b/plugins/splunk-on-call/src/components/types.ts
@@ -45,7 +45,7 @@ export type Team = {
   name?: string;
   slug?: string;
   memberCount?: number;
-  version?: string;
+  version?: number;
   isDefaultTeam?: boolean;
   _selfUrl?: string;
   _policiesUrl?: string;
@@ -86,6 +86,7 @@ export type OnCallUser = {
 export type User = {
   firstName?: string;
   lastName?: string;
+  displayName?: string;
   username?: string;
   email?: string;
   createdAt?: string;
@@ -108,6 +109,9 @@ export type Incident = {
   incidentNumber?: string;
   startTime?: string;
   currentPhase?: string;
+  entityState?: string;
+  entityType?: string;
+  routingKey?: string;
   alertCount?: number;
   lastAlertTime?: string;
   lastAlertId?: string;
@@ -127,7 +131,7 @@ export type Incident = {
 
 export type EscalationPolicyInfo = {
   policy: EscalationPolicySummary;
-  team: EscalationPolicyTeam;
+  team?: EscalationPolicyTeam;
 };
 
 export type IncidentTransition = {