diff --git a/src/components/AvatarCropModal/AvatarCropModal.js b/src/components/AvatarCropModal/AvatarCropModal.js
index baa958106f84..d16ba1364b71 100644
--- a/src/components/AvatarCropModal/AvatarCropModal.js
+++ b/src/components/AvatarCropModal/AvatarCropModal.js
@@ -366,6 +366,7 @@ function AvatarCropModal(props) {
style={[styles.pb0]}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
+ testID="AvatarCropModal"
>
{props.isSmallScreenWidth && }
{({safeAreaPaddingBottomStyle}) => (
diff --git a/src/components/HeaderPageLayout.js b/src/components/HeaderPageLayout.js
index bec1e52b1cad..b57a5bc85e82 100644
--- a/src/components/HeaderPageLayout.js
+++ b/src/components/HeaderPageLayout.js
@@ -58,6 +58,7 @@ function HeaderPageLayout({backgroundColor, children, footer, headerContainerSty
shouldEnablePickerAvoiding={false}
includeSafeAreaPaddingBottom={false}
offlineIndicatorStyle={[appBGColor]}
+ testID="HeaderPageLayout"
>
{({safeAreaPaddingBottomStyle}) => (
<>
diff --git a/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js b/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js
index 1149f9dc56ce..d0d52daa9206 100644
--- a/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js
+++ b/src/components/NewDatePicker/CalendarPicker/YearPickerModal.js
@@ -64,6 +64,7 @@ function YearPickerModal(props) {
style={[styles.pb0]}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
+ testID="YearPickerModal"
>
@@ -42,7 +41,7 @@ function ReimbursementAccountLoadingIndicator(props) {
style={styles.loadingVBAAnimation}
/>
- {props.translate('reimbursementAccountLoadingAnimation.explanationLine')}
+ {translate('reimbursementAccountLoadingAnimation.explanationLine')}
) : (
@@ -56,4 +55,4 @@ function ReimbursementAccountLoadingIndicator(props) {
ReimbursementAccountLoadingIndicator.propTypes = propTypes;
ReimbursementAccountLoadingIndicator.displayName = 'ReimbursementAccountLoadingIndicator';
-export default compose(withLocalize, withNetwork())(ReimbursementAccountLoadingIndicator);
+export default ReimbursementAccountLoadingIndicator;
diff --git a/src/components/ScreenWrapper/index.js b/src/components/ScreenWrapper/index.js
index f760e5d5aeb4..1cad1e96b26d 100644
--- a/src/components/ScreenWrapper/index.js
+++ b/src/components/ScreenWrapper/index.js
@@ -109,6 +109,7 @@ class ScreenWrapper extends React.Component {
style={styles.flex1}
// eslint-disable-next-line react/jsx-props-no-spreading
{...(this.props.environment === CONST.ENVIRONMENT.DEV ? this.panResponder.panHandlers : {})}
+ testID={this.props.testID}
>
+