From a3b3aa85176d2c6d7fd1da8cc95995583d8eef9a Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Thu, 22 Feb 2024 15:13:52 +0000
Subject: [PATCH] Move PreviewTests into their own scheme. (#2492)

* Use xcresultparser for coverage as there are 2 schemes now.
---
 .gitattributes                                |   3 +-
 .github/workflows/unit_tests.yml              |   5 +
 ElementX.xcodeproj/project.pbxproj            | 170 +++++++++++++++---
 .../xcschemes/PreviewTests.xcscheme           | 100 +++++++++++
 PreviewTests/SupportingFiles/Info.plist       |  22 +++
 .../SupportingFiles/PreviewTests.xctestplan   |  32 ++++
 PreviewTests/SupportingFiles/target.yml       |  51 ++++++
 .../test_advancedSettingsScreen.1.png         |   0
 .../test_analyticsPromptScreen.1.png          |   0
 ...t_analyticsPromptScreenCheckmarkItem.1.png |   0
 .../test_analyticsSettingsScreen.1.png        |   0
 .../PreviewTests/test_appLockScreen.1.png     |   0
 ...t_appLockSetupBiometricsScreen.Face-ID.png |   0
 ..._appLockSetupBiometricsScreen.Touch-ID.png |   0
 .../test_appLockSetupPINScreen.Confirm.png    |   0
 .../test_appLockSetupPINScreen.Create.png     |   0
 ...st_appLockSetupPINScreen.Unlock-Failed.png |   0
 .../test_appLockSetupPINScreen.Unlock.png     |   0
 ...est_appLockSetupSettingsScreen.Face-ID.png |   0
 ...st_appLockSetupSettingsScreen.PIN-only.png |   0
 ...SetupSettingsScreen.Touch-ID-Mandatory.png |   0
 .../test_audioRoomTimelineView.1.png          |   0
 .../test_audioRoomTimelineView.2.png          |   0
 .../test_avatarHeaderView.Members.png         |   0
 .../test_avatarHeaderView.Room.png            |   0
 .../PreviewTests/test_bugReport.1.png         |   0
 .../PreviewTests/test_bugReport.2.png         |   0
 .../test_collapsibleRoomTimelineView.1.png    |   0
 .../test_completionSuggestion.1.png           |   0
 .../test_completionSuggestion.2.png           |   0
 .../PreviewTests/test_composerToolbar.1.png   |   0
 .../test_composerToolbar.Voice-Message.png    |   0
 .../test_composerToolbar.With-Suggestions.png |   0
 ...t_createRoom.Create-Room-without-users.png |   0
 .../test_createRoom.Create-Room.png           |   0
 .../test_emojiPickerScreen.Screen.png         |   0
 .../test_emojiPickerScreen.Sheet.png          |   0
 .../test_emojiPickerScreenHeaderView.1.png    |   0
 .../test_emoteRoomTimelineView.1.png          |   0
 .../test_emoteRoomTimelineView.2.png          |   0
 ...est_encryptedHistoryRoomTimelineView.1.png |   0
 .../test_encryptedRoomTimelineView.1.png      |   0
 .../test_encryptedRoomTimelineView.2.png      |   0
 .../test_estimatedWaveformView.1.png          |   0
 .../test_fileRoomTimelineView.1.png           |   0
 .../test_fileRoomTimelineView.2.png           |   0
 .../PreviewTests/test_formButtonStyles.1.png  |   0
 .../PreviewTests/test_formRowLabelStyle.1.png |   0
 .../PreviewTests/test_formattedBodyText.1.png |   0
 .../PreviewTests/test_formattedBodyText.2.png |   0
 .../PreviewTests/test_formattingToolbar.1.png |   0
 .../PreviewTests/test_fullscreenDialog.1.png  |   0
 .../test_globalSearchScreen.1.png             |   0
 .../test_globalSearchScreenListRow.1.png      |   0
 .../PreviewTests/test_heroImage.1.png         |   0
 .../PreviewTests/test_homeScreen.Empty.png    |   0
 .../PreviewTests/test_homeScreen.Loaded.png   |   0
 .../PreviewTests/test_homeScreen.Loading.png  |   0
 .../test_homeScreen.Migrating.png             |   0
 ...creenEmptyStateView.Constrained-layout.png |   0
 ...homeScreenEmptyStateView.Normal-Layout.png |   0
 .../test_homeScreenEmptyStateView.View.png    |   0
 ...test_homeScreenInvitesButton.Badge-off.png |   0
 ...t_homeScreenInvitesButton.Badge-on-AX1.png |   0
 .../test_homeScreenInvitesButton.Badge-on.png |   0
 ...eScreenRecoveryKeyConfirmationBanner.1.png |   0
 .../test_homeScreenRoomCell.Generic.png       |   0
 ...homeScreenRoomCell.Notifications-State.png |   0
 ..._homeScreenSessionVerificationBanner.1.png |   0
 .../test_imageRoomTimelineView.1.png          |   0
 .../test_imageRoomTimelineView.2.png          |   0
 .../PreviewTests/test_inviteUsersScreen.1.png |   0
 .../test_inviteUsersScreenSelectedItem.1.png  |   0
 .../test_invitesScreen.No-Invites.png         |   0
 .../test_invitesScreen.Some-Invite.png        |   0
 .../PreviewTests/test_invitesScreenCell.1.png |   0
 .../test_legalInformationScreen.1.png         |   0
 .../test_locationMarkerView.1.png             |   0
 .../test_locationRoomTimelineView.Bubbles.png |   0
 .../test_locationRoomTimelineView.Plain.png   |   0
 .../test_loginScreen.Credentials-Entered.png  |   0
 .../test_loginScreen.OIDC-Fallback.png        |   0
 .../test_loginScreen.Unsupported.png          |   0
 .../test_loginScreen.matrix-org.png           |   0
 .../test_longPressWithFeedback.1.png          |   0
 .../test_mapLibreStaticMapView.1.png          |   0
 .../test_matrixUserPermalink.1.png            |   0
 .../test_mediaUploadPreviewScreen.1.png       |   0
 .../test_mentionSuggestionItemView.1.png      |   0
 .../test_mentionSuggestionItemView.2.png      |   0
 .../PreviewTests/test_messageComposer.1.png   |   0
 ...est_messageComposer.Replying-in-thread.png |   0
 .../test_messageComposer.Replying.png         |   0
 .../test_messageForwardingScreen.1.png        |   0
 .../test_messageText.Custom-Attachment.png    |   0
 .../test_messageText.Custom-Text.png          |   0
 .../test_messageText.SwiftUI-Default-Text.png |   0
 .../test_messageText.With-block-quote.png     |   0
 .../test_messageText.With-list.png            |   0
 .../test_noticeRoomTimelineView.1.png         |   0
 .../test_noticeRoomTimelineView.2.png         |   0
 ...tionSettingsEditScreen.Applying-change.png |   0
 ...icationSettingsEditScreen.Direct-Chats.png |   0
 ...tScreen.Group-Chats-Without-Disclaimer.png |   0
 ...ficationSettingsEditScreen.Group-Chats.png |   0
 ...tificationSettingsEditScreenRoomCell.1.png |   0
 .../test_notificationSettingsScreen.1.png     |   0
 ...nSettingsScreen.Configuration-mismatch.png |   0
 .../PreviewTests/test_onboardingScreen.1.png  |   0
 .../PreviewTests/test_pINTextField.1.png      |   0
 ..._paginationIndicatorRoomTimelineView.1.png |   0
 .../PreviewTests/test_pillView.All-Users.png  |   0
 .../test_pillView.Loaded-Long-Own.png         |   0
 .../test_pillView.Loaded-Long.png             |   0
 .../test_pillView.Loading-Own.png             |   0
 .../PreviewTests/test_pillView.Loading.png    |   0
 .../test_placeholderAvatarImage.1.png         |   0
 .../test_placeholderScreen.Screen.png         |   0
 .../test_placeholderScreen.Split-View.png     |   0
 ...test_placeholderScreen.With-background.png |   0
 .../PreviewTests/test_pollFormScreen.Edit.png |   0
 .../PreviewTests/test_pollFormScreen.New.png  |   0
 .../PreviewTests/test_pollOptionView.1.png    |   0
 ...mTimelineView.Creator-disclosed-Bubble.png |   0
 ...omTimelineView.Creator-disclosed-Plain.png |   0
 ...omTimelineView.Creator-no-votes-Bubble.png |   0
 ...oomTimelineView.Creator-no-votes-Plain.png |   0
 ..._pollRoomTimelineView.Disclosed-Bubble.png |   0
 ...t_pollRoomTimelineView.Disclosed-Plain.png |   0
 ...oomTimelineView.Ended-Disclosed-Bubble.png |   0
 ...RoomTimelineView.Ended-Disclosed-Plain.png |   0
 ...mTimelineView.Ended-Undisclosed-Bubble.png |   0
 ...omTimelineView.Ended-Undisclosed-Plain.png |   0
 ...ollRoomTimelineView.Undisclosed-Bubble.png |   0
 ...pollRoomTimelineView.Undisclosed-Plain.png |   0
 .../test_pollView.Creator-disclosed.png       |   0
 .../test_pollView.Creator-no-votes.png        |   0
 .../PreviewTests/test_pollView.Disclosed.png  |   0
 .../test_pollView.Ended-Disclosed.png         |   0
 .../test_pollView.Ended-Undisclosed.png       |   0
 .../test_pollView.Undisclosed.png             |   0
 .../test_reactionsSummaryView.1.png           |   0
 .../test_readMarkerRoomTimelineView.1.png     |   0
 .../test_readReceiptCell.Loading-Member.png   |   0
 .../test_readReceiptCell.No-Image.png         |   0
 .../test_readReceiptCell.With-Image.png       |   0
 .../test_readReceiptsSummaryView.1.png        |   0
 .../test_redactedRoomTimelineView.1.png       |   0
 .../test_reportContentScreen.1.png            |   0
 .../test_roomAttachmentPicker.1.png           |   0
 .../test_roomDetailsEditScreen.Normal.png     |   0
 .../test_roomDetailsEditScreen.Read-only.png  |   0
 .../test_roomDetailsScreen.DM-Room.png        |   0
 .../test_roomDetailsScreen.Generic-Room.png   |   0
 .../test_roomDetailsScreen.Simple-Room.png    |   0
 .../PreviewTests/test_roomHeaderView.1.png    |   0
 .../PreviewTests/test_roomHeaderView.2.png    |   0
 .../test_roomListFilterView.1.png             |   0
 .../test_roomListFilterView.2.png             |   0
 .../test_roomListFiltersView.1.png            |   0
 .../test_roomListFiltersView.2.png            |   0
 ..._roomMemberDetailsScreen.Account-Owner.png |   0
 ...t_roomMemberDetailsScreen.Ignored-User.png |   0
 ...est_roomMemberDetailsScreen.Other-User.png |   0
 .../test_roomMembersListMemberCell.1.png      |   0
 ...est_roomMembersListScreen.Admin-Banned.png |   0
 ...st_roomMembersListScreen.Admin-Members.png |   0
 .../test_roomMembersListScreen.Invites.png    |   0
 .../test_roomMembersListScreen.Member.png     |   0
 ...ionSettingsCustomSectionView.Encrypted.png |   0
 ...nSettingsCustomSectionView.Unencrypted.png |   0
 ..._roomNotificationSettingsScreen.Custom.png |   0
 ...roomNotificationSettingsScreen.Default.png |   0
 ...ionSettingsUserDefinedScreen.Encrypted.png |   0
 ...nSettingsUserDefinedScreen.Unencrypted.png |   0
 .../test_roomPollsHistoryScreen.No-polls.png  |   0
 .../test_roomPollsHistoryScreen.polls.png     |   0
 .../PreviewTests/test_roomScreen.1.png        |   0
 ...est_secureBackupKeyBackupScreen.Set-up.png |   0
 ...secureBackupLogoutConfirmationScreen.1.png |   0
 ...cureBackupRecoveryKeyScreen.Incomplete.png |   0
 ...cureBackupRecoveryKeyScreen.Not-set-up.png |   0
 ...t_secureBackupRecoveryKeyScreen.Set-up.png |   0
 .../test_secureBackupScreen.Both-setup.png    |   0
 ...secureBackupScreen.Key-backup-disabled.png |   0
 ...cureBackupScreen.Only-key-backup-setup.png |   0
 ...secureBackupScreen.Recovery-incomplete.png |   0
 .../test_separatorRoomTimelineView.1.png      |   0
 .../test_serverConfirmationScreen.Login.png   |   0
 ...test_serverConfirmationScreen.Register.png |   0
 .../PreviewTests/test_serverSelection.1.png   |   0
 .../PreviewTests/test_serverSelection.2.png   |   0
 .../PreviewTests/test_serverSelection.3.png   |   0
 .../PreviewTests/test_serverSelection.4.png   |   0
 .../test_sessionVerification.Cancelled.png    |   0
 .../test_sessionVerification.Initial.png      |   0
 ...t_sessionVerification.Request-Accepted.png |   0
 ...onVerification.Requesting-Verification.png |   0
 ..._sessionVerification.Showing-Challenge.png |   0
 .../test_sessionVerification.Verified.png     |   0
 .../PreviewTests/test_settingsScreen.1.png    |   0
 .../PreviewTests/test_shimmerOverlay.1.png    |   0
 .../PreviewTests/test_softLogoutScreen.1.png  |   0
 .../PreviewTests/test_softLogoutScreen.2.png  |   0
 .../PreviewTests/test_softLogoutScreen.3.png  |   0
 .../PreviewTests/test_softLogoutScreen.4.png  |   0
 .../PreviewTests/test_softLogoutScreen.5.png  |   0
 .../PreviewTests/test_splashScreen.1.png      |   0
 .../PreviewTests/test_startChatScreen.1.png   |   0
 .../test_stateRoomTimelineView.1.png          |   0
 .../test_stateRoomTimelineView.2.png          |   0
 ...test_staticLocationScreenViewer.Picker.png |   0
 ...creenViewer.View-Only-with-description.png |   0
 ...t_staticLocationScreenViewer.View-Only.png |   0
 .../test_stickerRoomTimelineView.1.png        |   0
 .../test_stickerRoomTimelineView.2.png        |   0
 .../PreviewTests/test_swipeRightAction.1.png  |   0
 .../PreviewTests/test_swipeToReplyView.1.png  |   0
 .../PreviewTests/test_templateScreen.1.png    |   0
 .../test_textRoomTimelineView.Bubble-RTL.png  |   0
 .../test_textRoomTimelineView.Bubble.png      |   0
 .../test_textRoomTimelineView.Plain-RTL.png   |   0
 .../test_textRoomTimelineView.Plain.png       |   0
 .../PreviewTests/test_threadDecorator.1.png   |   0
 .../test_timelineDeliveryStatusView.1.png     |   0
 ...temBubbledStylerView.Mock-Timeline-RTL.png |   0
 ...ineItemBubbledStylerView.Mock-Timeline.png |   0
 ..._timelineItemBubbledStylerView.Replies.png |   0
 ...ItemBubbledStylerView.Thread-decorator.png |   0
 .../test_timelineItemDebugView.1.png          |   0
 .../PreviewTests/test_timelineItemMenu.1.png  |   0
 .../test_timelineItemPlainStylerView.1.png    |   0
 ...st_timelineItemPlainStylerView.Threads.png |   0
 ...es-LTR-with-different-layout-languages.png |   0
 ...es-RTL-with-different-layout-languages.png |   0
 .../test_timelineItemStyler.Bubbles.png       |   0
 .../test_timelineItemStyler.Plain.png         |   0
 .../test_timelineReactionView.1.png           |   0
 .../test_timelineReadReceiptsView.1.png       |   0
 .../PreviewTests/test_timelineReplyView.1.png |   0
 .../test_timelineStartRoomTimelineView.1.png  |   0
 .../PreviewTests/test_timelineView.1.png      |   0
 .../test_typingIndicatorView.1.png            |   0
 .../PreviewTests/test_uITimelineView.1.png    |   0
 .../test_unsupportedRoomTimelineView.1.png    |   0
 .../test_unsupportedRoomTimelineView.2.png    |   0
 .../test_userDetailsEditScreen.1.png          |   0
 ...est_userIndicatorModalView.No-progress.png |   0
 ...st_userIndicatorModalView.Progress-Bar.png |   0
 .../test_userIndicatorModalView.Spinner.png   |   0
 .../test_userIndicatorToastView.1.png         |   0
 .../PreviewTests/test_userProfileCell.1.png   |   0
 .../test_videoRoomTimelineView.1.png          |   0
 .../test_videoRoomTimelineView.2.png          |   0
 .../test_voiceMessageButton.1.png             |   0
 .../test_voiceMessagePreviewComposer.1.png    |   0
 .../test_voiceMessageRecordingButton.1.png    |   0
 .../test_voiceMessageRecordingComposer.1.png  |   0
 .../test_voiceMessageRecordingView.1.png      |   0
 .../test_voiceMessageRoomPlaybackView.1.png   |   0
 ...st_voiceMessageRoomTimelineView.Bubble.png |   0
 ...est_voiceMessageRoomTimelineView.Plain.png |   0
 .../PreviewTests/test_waitingDialog.1.png     |   0
 .../test_waitlistScreen.Success.png           |   0
 .../test_waitlistScreen.Waiting.png           |   0
 .../test_waveformCursorView.1.png             |   0
 .../PreviewTests/test_welcomeScreen.1.png     |   0
 UnitTests/SupportingFiles/target.yml          |   5 -
 ci_scripts/ci_common.sh                       |   2 +-
 fastlane/Fastfile                             |  16 +-
 project.yml                                   |   1 +
 271 files changed, 367 insertions(+), 40 deletions(-)
 create mode 100644 ElementX.xcodeproj/xcshareddata/xcschemes/PreviewTests.xcscheme
 create mode 100644 PreviewTests/SupportingFiles/Info.plist
 create mode 100644 PreviewTests/SupportingFiles/PreviewTests.xctestplan
 create mode 100644 PreviewTests/SupportingFiles/target.yml
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_advancedSettingsScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_analyticsPromptScreenCheckmarkItem.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_analyticsSettingsScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Face-ID.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Touch-ID.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Face-ID.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.PIN-only.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Touch-ID-Mandatory.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_audioRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_audioRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_avatarHeaderView.Members.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_avatarHeaderView.Room.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_bugReport.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_bugReport.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_collapsibleRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_completionSuggestion.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_completionSuggestion.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_composerToolbar.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_composerToolbar.With-Suggestions.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_createRoom.Create-Room-without-users.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_createRoom.Create-Room.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_emojiPickerScreen.Screen.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_emojiPickerScreen.Sheet.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_emojiPickerScreenHeaderView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_encryptedHistoryRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_estimatedWaveformView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_fileRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_fileRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_formButtonStyles.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_formattedBodyText.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_formattedBodyText.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_formattingToolbar.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_globalSearchScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_globalSearchScreenListRow.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_heroImage.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreen.Empty.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreen.Loading.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreen.Migrating.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-off.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on-AX1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenRecoveryKeyConfirmationBanner.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Generic.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Notifications-State.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_homeScreenSessionVerificationBanner.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_imageRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_imageRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_inviteUsersScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_inviteUsersScreenSelectedItem.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_invitesScreen.No-Invites.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_invitesScreen.Some-Invite.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_invitesScreenCell.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_legalInformationScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_locationMarkerView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Bubbles.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_longPressWithFeedback.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_mapLibreStaticMapView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_matrixUserPermalink.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageComposer.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageComposer.Replying.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageForwardingScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageText.Custom-Attachment.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageText.Custom-Text.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageText.SwiftUI-Default-Text.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageText.With-block-quote.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_messageText.With-list.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Applying-change.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Direct-Chats.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats-Without-Disclaimer.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_notificationSettingsEditScreenRoomCell.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_notificationSettingsScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_notificationSettingsScreen.Configuration-mismatch.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_onboardingScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pINTextField.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_paginationIndicatorRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pillView.All-Users.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pillView.Loading.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_placeholderAvatarImage.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_placeholderScreen.Screen.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_placeholderScreen.Split-View.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_placeholderScreen.With-background.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollFormScreen.Edit.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollFormScreen.New.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollOptionView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollView.Disclosed.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_reactionsSummaryView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_readMarkerRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_readReceiptCell.Loading-Member.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_readReceiptCell.No-Image.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_readReceiptCell.With-Image.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_readReceiptsSummaryView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_redactedRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_reportContentScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomAttachmentPicker.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Read-only.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomHeaderView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomHeaderView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomListFilterView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomListFilterView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomListFiltersView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomListFiltersView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Banned.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Members.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomMembersListScreen.Invites.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomMembersListScreen.Member.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Encrypted.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Unencrypted.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Custom.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Default.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Encrypted.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Unencrypted.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.No-polls.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_roomScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupScreen.Both-setup.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupScreen.Key-backup-disabled.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupScreen.Only-key-backup-setup.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_separatorRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_serverSelection.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_serverSelection.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_serverSelection.3.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_serverSelection.4.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_settingsScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_splashScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_startChatScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_stateRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_stateRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_swipeRightAction.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_templateScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble-RTL.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain-RTL.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_threadDecorator.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Replies.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Thread-decorator.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-LTR-with-different-layout-languages.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-RTL-with-different-layout-languages.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineReactionView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineReplyView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineStartRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_timelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_typingIndicatorView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_uITimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_userIndicatorModalView.No-progress.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_userIndicatorModalView.Progress-Bar.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_userIndicatorModalView.Spinner.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_userIndicatorToastView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_userProfileCell.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_videoRoomTimelineView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_videoRoomTimelineView.2.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_voiceMessageButton.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_voiceMessagePreviewComposer.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_voiceMessageRecordingButton.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_voiceMessageRecordingView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_voiceMessageRoomPlaybackView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Bubble.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_waitingDialog.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_waitlistScreen.Waiting.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_waveformCursorView.1.png (100%)
 rename {UnitTests => PreviewTests}/__Snapshots__/PreviewTests/test_welcomeScreen.1.png (100%)

diff --git a/.gitattributes b/.gitattributes
index 90545e45a..4f81d1136 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 UITests/Sources/__Snapshots__/** filter=lfs diff=lfs merge=lfs -text
 UnitTests/Resources/** filter=lfs diff=lfs merge=lfs -text
-UnitTests/__Snapshots__/** filter=lfs diff=lfs merge=lfs -text
\ No newline at end of file
+UnitTests/__Snapshots__/** filter=lfs diff=lfs merge=lfs -text
+PreviewTests/__Snapshots__/** filter=lfs diff=lfs merge=lfs -text
\ No newline at end of file
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index abc5c01ca..21452ad07 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -59,6 +59,11 @@ jobs:
             retention-days: 1
             if-no-files-found: ignore
       
+      - name: Collect coverage
+        run: |
+          xcresultparser -q -o cobertura -t ElementX -p $(pwd) fastlane/test_output/UnitTests.xcresult > fastlane/test_output/unittests-cobertura.xml
+          xcresultparser -q -o cobertura -t ElementX -p $(pwd) fastlane/test_output/PreviewTests.xcresult > fastlane/test_output/previewtests-cobertura.xml
+      
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 15c936d50..ad0bcf72e 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -491,6 +491,7 @@
 		7CFCC177F0ED083867FAD9C9 /* OnboardingScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37E727F7E0BCE8A0BBFD33FF /* OnboardingScreenCoordinator.swift */; };
 		7D261B5119E78CC8E771CA15 /* GlobalSearchScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74653BE903970C0E36867D46 /* GlobalSearchScreenCoordinator.swift */; };
 		7D58B4F46CAA9A7C3E4C6A30 /* UserDetailsEditScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88410BD213FDF9B28E8B671F /* UserDetailsEditScreen.swift */; };
+		7D6DC832DE7A3DE874E2E9BC /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 7B6BC3219ADD8AA0311D2B86 /* SnapshotTesting */; };
 		7E2BB42805C59DB57E95610F /* PillView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7773CBFDBD458E0B7E270507 /* PillView.swift */; };
 		7E91BAC17963ED41208F489B /* UserSessionStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E8BDC092D817B68CD9040C5 /* UserSessionStore.swift */; };
 		7ECF12D5DCD69F67BD3E3842 /* RoomTimelineControllerFactoryProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18FE0CDF1FFA92EA7EE17B0B /* RoomTimelineControllerFactoryProtocol.swift */; };
@@ -500,7 +501,6 @@
 		7F64FA937B95924B3A44EC12 /* OnboardingScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB8E75B9CB6C78BE8D09B1AF /* OnboardingScreen.swift */; };
 		7F7EA51A9A43125A8CB6AC90 /* NotificationSettingsScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46D560DDA3B20C82766ACFAD /* NotificationSettingsScreenViewModel.swift */; };
 		7FB0BDE26838F1A92782D5E1 /* MediaUploadPreviewScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39B6C8690AEA1E49FF1BAF95 /* MediaUploadPreviewScreenUITests.swift */; };
-		7FF27DA70D833CFC5724EFC5 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 1CAB56FF1DE17B3E871A0BA2 /* SnapshotTesting */; };
 		8015842CB4DE1BE414D2CDED /* AppLockSetupBiometricsScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C62E07C1164F5120727A2A8 /* AppLockSetupBiometricsScreenCoordinator.swift */; };
 		8024BE37156FF0A95A7A3465 /* AnalyticsPromptUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF11DD57D9FACF2A757AB024 /* AnalyticsPromptUITests.swift */; };
 		804C15D8ADE0EA7A5268F58A /* OverridableAvatarImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 648DD1C10E4957CB791FE0B8 /* OverridableAvatarImage.swift */; };
@@ -1015,6 +1015,7 @@
 		FE4593FC2A02AAF92E089565 /* ElementAnimations.swift in Sources */ = {isa = PBXBuildFile; fileRef = EF1593DD87F974F8509BB619 /* ElementAnimations.swift */; };
 		FF34BF2AF731340AF9414A18 /* SwipeRightAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4552D3466B1453F287223ADA /* SwipeRightAction.swift */; };
 		FF7E8ECC8E7E1D1851517536 /* PollFormScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347D708104CCEF771428C9A3 /* PollFormScreenViewModelTests.swift */; };
+		FF9C06BBF6AC6F1CFFBEBFFC /* target.yml in Resources */ = {isa = PBXBuildFile; fileRef = 90791B9C739C716A40E1B230 /* target.yml */; };
 		FFD3E4FF948E06C7585317FC /* TimelineStyler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 892E29C98C4E8182C9037F84 /* TimelineStyler.swift */; };
 /* End PBXBuildFile section */
 
@@ -1040,6 +1041,13 @@
 			remoteGlobalIDString = C0FAEB81CFD9776CD78CE489;
 			remoteInfo = ElementX;
 		};
+		889C131F86E6415074D382B9 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = AC22997D58D612146053154D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = C0FAEB81CFD9776CD78CE489;
+			remoteInfo = ElementX;
+		};
 		AE0C21E7E01A23610E54DF9D /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = AC22997D58D612146053154D /* Project object */;
@@ -1219,6 +1227,7 @@
 		25F7FE40EF7490A7E09D7BE6 /* NotificationItemProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationItemProxy.swift; sourceTree = "<group>"; };
 		25F8664F1FB95AF3C4202478 /* PollFormScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenCoordinator.swift; sourceTree = "<group>"; };
 		260004737C573A56FA01E86E /* Encodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Encodable.swift; sourceTree = "<group>"; };
+		267BB1D5B08A9511F894CB57 /* PreviewTests.xctestplan */ = {isa = PBXFileReference; path = PreviewTests.xctestplan; sourceTree = "<group>"; };
 		26B0A96B8FE4849227945067 /* VoiceMessageRecorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageRecorder.swift; sourceTree = "<group>"; };
 		26EAAB54C6CE91D64B69A9F8 /* AppLockServiceProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockServiceProtocol.swift; sourceTree = "<group>"; };
 		2757B1BE23DF8AA239937243 /* AudioConverterProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioConverterProtocol.swift; sourceTree = "<group>"; };
@@ -1589,6 +1598,7 @@
 		8F61A0DD8243B395499C99A2 /* InvitesScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitesScreenUITests.swift; sourceTree = "<group>"; };
 		8F7D42E66E939B709C1EC390 /* MockRoomSummaryProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockRoomSummaryProvider.swift; sourceTree = "<group>"; };
 		8FC803282F9268D49F4ABF14 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
+		90791B9C739C716A40E1B230 /* target.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = target.yml; sourceTree = "<group>"; };
 		907FA4DE17DEA1A3738EFB83 /* AudioRecorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioRecorder.swift; sourceTree = "<group>"; };
 		90A55430639712CFACA34F43 /* TextRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextRoomTimelineItem.swift; sourceTree = "<group>"; };
 		90F2F8998E5632668B0AD848 /* RoomTimelineItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemView.swift; sourceTree = "<group>"; };
@@ -1877,11 +1887,13 @@
 		D8E60332509665C00179ACF6 /* MessageForwardingScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageForwardingScreenViewModel.swift; sourceTree = "<group>"; };
 		D8F5F9E02B1AB5350B1815E7 /* TimelineStartRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStartRoomTimelineItem.swift; sourceTree = "<group>"; };
 		D93C94C30E3135BC9290DE13 /* VoiceMessageRecorderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageRecorderTests.swift; sourceTree = "<group>"; };
+		D95E8C0EFEC0C6F96EDAA71A /* PreviewTests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = PreviewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA14564EE143F73F7E4D1F79 /* RoomNotificationSettingsScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsScreenModels.swift; sourceTree = "<group>"; };
 		DA2AEC1AB349A341FE13DEC1 /* StartChatScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartChatScreenUITests.swift; sourceTree = "<group>"; };
 		DA3D82522494E78746B2214E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SAS.strings; sourceTree = "<group>"; };
 		DAB8D7926A5684E18196B538 /* VoiceMessageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageCache.swift; sourceTree = "<group>"; };
 		DB06F22CFA34885B40976061 /* RoomDetailsEditScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetailsEditScreen.swift; sourceTree = "<group>"; };
+		DBEDCEC9D908C19C63D24395 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		DC0AEA686E425F86F6BA0404 /* UNNotification+Creator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNNotification+Creator.swift"; sourceTree = "<group>"; };
 		DC10CCC8D68B863E20660DBC /* MessageForwardingScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageForwardingScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		DC528B3764E3CF7FCFEF40E7 /* PollInteractionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollInteractionHandler.swift; sourceTree = "<group>"; };
@@ -2023,14 +2035,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		A7A4BAD642A61DCC41621311 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				7FF27DA70D833CFC5724EFC5 /* SnapshotTesting in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		BF59B36A7B2DB184B62826F6 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -2048,6 +2052,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		C68A5D5A38E20DD51CF4B4FD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7D6DC832DE7A3DE874E2E9BC /* SnapshotTesting in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		CD30252A70288BD4BF476ED7 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -2304,6 +2316,14 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		1803CD2B96BF06009334BB61 /* PreviewTests */ = {
+			isa = PBXGroup;
+			children = (
+				A0D745ADE5568E50270F70EF /* SupportingFiles */,
+			);
+			path = PreviewTests;
+			sourceTree = "<group>";
+		};
 		1BC3028DDD0C27AE5318FEDC /* Form Styles */ = {
 			isa = PBXGroup;
 			children = (
@@ -2757,6 +2777,7 @@
 				8A9C09B6A392465E03B8D1B1 /* IntegrationTests */,
 				823ED0EC3F1B6CF47D284011 /* Tools */,
 				B04B538A859CD012755DC19C /* NSE */,
+				1803CD2B96BF06009334BB61 /* PreviewTests */,
 				681566846AF307E9BA4C72C6 /* Products */,
 			);
 			sourceTree = "<group>";
@@ -3184,6 +3205,7 @@
 				4CD6AC7546E8D7E5C73CEA48 /* ElementX.app */,
 				9C7F7DE62D33C6A26CBFCD72 /* IntegrationTests.xctest */,
 				0D8F620C8B314840D8602E3F /* NSE.appex */,
+				D95E8C0EFEC0C6F96EDAA71A /* PreviewTests.xctest */,
 				F506C6ADB1E1DA6638078E11 /* UITests.xctest */,
 				AAC9344689121887B74877AF /* UnitTests.xctest */,
 			);
@@ -3961,6 +3983,16 @@
 			path = Localizations;
 			sourceTree = "<group>";
 		};
+		A0D745ADE5568E50270F70EF /* SupportingFiles */ = {
+			isa = PBXGroup;
+			children = (
+				DBEDCEC9D908C19C63D24395 /* Info.plist */,
+				267BB1D5B08A9511F894CB57 /* PreviewTests.xctestplan */,
+				90791B9C739C716A40E1B230 /* target.yml */,
+			);
+			path = SupportingFiles;
+			sourceTree = "<group>";
+		};
 		A151229F1A2347F37558496A /* View */ = {
 			isa = PBXGroup;
 			children = (
@@ -4822,22 +4854,39 @@
 			buildPhases = (
 				11F93544B4FC60F78F47D89C /* Sources */,
 				9B3512762CF4A1D45A79C340 /* Resources */,
-				A7A4BAD642A61DCC41621311 /* Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				0EEC1557A40FBA6DF49D83A2 /* PBXTargetDependency */,
-				9A791554EB868FA6F6B95324 /* PBXTargetDependency */,
 			);
 			name = UnitTests;
-			packageProductDependencies = (
-				1CAB56FF1DE17B3E871A0BA2 /* SnapshotTesting */,
-			);
 			productName = UnitTests;
 			productReference = AAC9344689121887B74877AF /* UnitTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		7A17BE29BAC81ADBAC6349D9 /* PreviewTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = DA320DCEE4CFFAF3A564D280 /* Build configuration list for PBXNativeTarget "PreviewTests" */;
+			buildPhases = (
+				21960A0295DAB67E0015DD08 /* Sources */,
+				91A7C1F08EC0DBF0B4357B36 /* Resources */,
+				C68A5D5A38E20DD51CF4B4FD /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				8E24DC048A099AAFEE13B4F5 /* PBXTargetDependency */,
+				E4E4D88701DC0E48B9F02526 /* PBXTargetDependency */,
+			);
+			name = PreviewTests;
+			packageProductDependencies = (
+				7B6BC3219ADD8AA0311D2B86 /* SnapshotTesting */,
+			);
+			productName = PreviewTests;
+			productReference = D95E8C0EFEC0C6F96EDAA71A /* PreviewTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 		C0FAEB81CFD9776CD78CE489 /* ElementX */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = B15427F8699AD5A5FC75C17E /* Build configuration list for PBXNativeTarget "ElementX" */;
@@ -4960,6 +5009,9 @@
 					32C23C8D224D46EFE62AFAD0 = {
 						DevelopmentTeam = 7J4U792NQT;
 					};
+					7A17BE29BAC81ADBAC6349D9 = {
+						DevelopmentTeam = 7J4U792NQT;
+					};
 					C0FAEB81CFD9776CD78CE489 = {
 						DevelopmentTeam = "$(DEVELOPMENT_TEAM)";
 					};
@@ -5029,6 +5081,7 @@
 				D3DB351B7FBE0F49649171FC /* IntegrationTests */,
 				FEB53A5BC378C913769656D8 /* NSE */,
 				F8E276FD6DC43EADB85241BC /* Periphery */,
+				7A17BE29BAC81ADBAC6349D9 /* PreviewTests */,
 				0E28CD62691FDBC63147D5E3 /* UITests */,
 				32C23C8D224D46EFE62AFAD0 /* UnitTests */,
 			);
@@ -5070,6 +5123,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		91A7C1F08EC0DBF0B4357B36 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				FF9C06BBF6AC6F1CFFBEBFFC /* target.yml in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		9B3512762CF4A1D45A79C340 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -5375,6 +5436,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		21960A0295DAB67E0015DD08 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		9797D588420FCBBC228A63C9 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -6168,9 +6236,14 @@
 			target = C0FAEB81CFD9776CD78CE489 /* ElementX */;
 			targetProxy = 6848AF4480814C5F810FB7EB /* PBXContainerItemProxy */;
 		};
-		9A791554EB868FA6F6B95324 /* PBXTargetDependency */ = {
+		8E24DC048A099AAFEE13B4F5 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			productRef = B717B96C04D7B6A1212D9EDC /* PrefireTestsPlugin */;
+			target = C0FAEB81CFD9776CD78CE489 /* ElementX */;
+			targetProxy = 889C131F86E6415074D382B9 /* PBXContainerItemProxy */;
+		};
+		E4E4D88701DC0E48B9F02526 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			productRef = 7D8AF269E16478B19C7F7613 /* PrefireTestsPlugin */;
 		};
 /* End PBXTargetDependency section */
 
@@ -6295,6 +6368,24 @@
 			};
 			name = Release;
 		};
+		5206AC013E4214ADC89F8C3C /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				INFOPLIST_FILE = PreviewTests/SupportingFiles/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.preview.tests";
+				PRODUCT_NAME = PreviewTests;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ElementX.app/ElementX";
+			};
+			name = Debug;
+		};
 		584E20C1DA5831E0694FE350 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -6643,6 +6734,24 @@
 			};
 			name = Release;
 		};
+		FA443F049643C8C3F0066E59 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				INFOPLIST_FILE = PreviewTests/SupportingFiles/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.preview.tests";
+				PRODUCT_NAME = PreviewTests;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ElementX.app/ElementX";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -6700,6 +6809,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
+		DA320DCEE4CFFAF3A564D280 /* Build configuration list for PBXNativeTarget "PreviewTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5206AC013E4214ADC89F8C3C /* Debug */,
+				FA443F049643C8C3F0066E59 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
 		F1B67CF63C1231AEB14D70E6 /* Build configuration list for PBXNativeTarget "UITests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -6937,11 +7055,6 @@
 			package = 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */;
 			productName = GZIP;
 		};
-		1CAB56FF1DE17B3E871A0BA2 /* SnapshotTesting */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = E9C4F3A12AA1F65C13A8C8EB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
-			productName = SnapshotTesting;
-		};
 		21C83087604B154AA30E9A8F /* SnapshotTesting */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = E9C4F3A12AA1F65C13A8C8EB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
@@ -7062,6 +7175,16 @@
 			package = CCD235515AFCEE6D2005B705 /* XCRemoteSwiftPackageReference "LRUCache" */;
 			productName = LRUCache;
 		};
+		7B6BC3219ADD8AA0311D2B86 /* SnapshotTesting */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = E9C4F3A12AA1F65C13A8C8EB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
+			productName = SnapshotTesting;
+		};
+		7D8AF269E16478B19C7F7613 /* PrefireTestsPlugin */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 22E7BA2ED466B74739AB8567 /* XCRemoteSwiftPackageReference "Prefire" */;
+			productName = "plugin:PrefireTestsPlugin";
+		};
 		800631D7250B7F93195035F1 /* KeychainAccess */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 61916C63E3F5BD900F08DA0C /* XCRemoteSwiftPackageReference "KeychainAccess" */;
@@ -7137,11 +7260,6 @@
 			package = 80B898A3AD2AC63F3ABFC218 /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */;
 			productName = MatrixRustSDK;
 		};
-		B717B96C04D7B6A1212D9EDC /* PrefireTestsPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 22E7BA2ED466B74739AB8567 /* XCRemoteSwiftPackageReference "Prefire" */;
-			productName = "plugin:PrefireTestsPlugin";
-		};
 		BA93CD75CCE486660C9040BD /* Collections */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */;
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/PreviewTests.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/PreviewTests.xcscheme
new file mode 100644
index 000000000..86b8247e9
--- /dev/null
+++ b/ElementX.xcodeproj/xcshareddata/xcschemes/PreviewTests.xcscheme
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7A17BE29BAC81ADBAC6349D9"
+               BuildableName = "PreviewTests.xctest"
+               BlueprintName = "PreviewTests"
+               ReferencedContainer = "container:ElementX.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7A17BE29BAC81ADBAC6349D9"
+            BuildableName = "PreviewTests.xctest"
+            BlueprintName = "PreviewTests"
+            ReferencedContainer = "container:ElementX.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C0FAEB81CFD9776CD78CE489"
+            BuildableName = "ElementX.app"
+            BlueprintName = "ElementX"
+            ReferencedContainer = "container:ElementX.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:PreviewTests/SupportingFiles/PreviewTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7A17BE29BAC81ADBAC6349D9"
+            BuildableName = "PreviewTests.xctest"
+            BlueprintName = "PreviewTests"
+            ReferencedContainer = "container:ElementX.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7A17BE29BAC81ADBAC6349D9"
+            BuildableName = "PreviewTests.xctest"
+            BlueprintName = "PreviewTests"
+            ReferencedContainer = "container:ElementX.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/PreviewTests/SupportingFiles/Info.plist b/PreviewTests/SupportingFiles/Info.plist
new file mode 100644
index 000000000..6c40a6cd0
--- /dev/null
+++ b/PreviewTests/SupportingFiles/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/PreviewTests/SupportingFiles/PreviewTests.xctestplan b/PreviewTests/SupportingFiles/PreviewTests.xctestplan
new file mode 100644
index 000000000..10560cace
--- /dev/null
+++ b/PreviewTests/SupportingFiles/PreviewTests.xctestplan
@@ -0,0 +1,32 @@
+{
+  "configurations" : [
+    {
+      "id" : "D789E5F1-30B8-4A23-B20E-281ACE05CFD6",
+      "name" : "Default",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "defaultTestExecutionTimeAllowance" : 60,
+    "environmentVariableEntries" : [
+      {
+        "key" : "IS_RUNNING_UNIT_TESTS",
+        "value" : "1"
+      }
+    ],
+    "testExecutionOrdering" : "random",
+    "testTimeoutsEnabled" : true
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:ElementX.xcodeproj",
+        "identifier" : "7A17BE29BAC81ADBAC6349D9",
+        "name" : "PreviewTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/PreviewTests/SupportingFiles/target.yml b/PreviewTests/SupportingFiles/target.yml
new file mode 100644
index 000000000..1b4bf51d1
--- /dev/null
+++ b/PreviewTests/SupportingFiles/target.yml
@@ -0,0 +1,51 @@
+name: PreviewTests
+
+schemes:
+  PreviewTests:
+    analyze:
+      config: Debug
+    archive:
+      config: Release
+    build:
+      targets:
+        PreviewTests: all
+    profile:
+      config: Release
+    run:
+      config: Debug
+      disableMainThreadChecker: false
+    test:
+      config: Debug
+      disableMainThreadChecker: false
+      gatherCoverageData: true
+      coverageTargets:
+        - ElementX
+      testPlans:
+        - path: PreviewTests.xctestplan
+          defaultPlan: true
+
+targets:
+  PreviewTests:
+    type: bundle.unit-test
+    platform: iOS
+    
+    buildToolPlugins:
+    - plugin: PrefireTestsPlugin
+      package: Prefire
+
+    dependencies:
+    - target: ElementX
+    - package: SnapshotTesting
+
+    info:
+      path: ../SupportingFiles/Info.plist
+
+    settings:
+      base:
+        PRODUCT_NAME: PreviewTests
+        PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.preview.tests
+      debug:
+      release:
+
+    sources:
+    - path: ../SupportingFiles
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_advancedSettingsScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_analyticsPromptScreenCheckmarkItem.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreenCheckmarkItem.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_analyticsPromptScreenCheckmarkItem.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_analyticsPromptScreenCheckmarkItem.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_analyticsSettingsScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_analyticsSettingsScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_analyticsSettingsScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_analyticsSettingsScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Face-ID.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Face-ID.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Face-ID.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Face-ID.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Touch-ID.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Touch-ID.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Touch-ID.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupBiometricsScreen.Touch-ID.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Confirm.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Create.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock-Failed.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupPINScreen.Unlock.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Face-ID.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Face-ID.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Face-ID.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Face-ID.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.PIN-only.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.PIN-only.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.PIN-only.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.PIN-only.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Touch-ID-Mandatory.png b/PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Touch-ID-Mandatory.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Touch-ID-Mandatory.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_appLockSetupSettingsScreen.Touch-ID-Mandatory.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_audioRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_avatarHeaderView.Members.png b/PreviewTests/__Snapshots__/PreviewTests/test_avatarHeaderView.Members.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_avatarHeaderView.Members.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_avatarHeaderView.Members.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_avatarHeaderView.Room.png b/PreviewTests/__Snapshots__/PreviewTests/test_avatarHeaderView.Room.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_avatarHeaderView.Room.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_avatarHeaderView.Room.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_bugReport.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_bugReport.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_bugReport.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_bugReport.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_bugReport.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_bugReport.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_bugReport.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_bugReport.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_collapsibleRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_collapsibleRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_collapsibleRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_collapsibleRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_completionSuggestion.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_completionSuggestion.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_completionSuggestion.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_completionSuggestion.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_completionSuggestion.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_completionSuggestion.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_completionSuggestion.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_completionSuggestion.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_composerToolbar.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_composerToolbar.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png b/PreviewTests/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_composerToolbar.Voice-Message.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.With-Suggestions.png b/PreviewTests/__Snapshots__/PreviewTests/test_composerToolbar.With-Suggestions.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_composerToolbar.With-Suggestions.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_composerToolbar.With-Suggestions.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room-without-users.png b/PreviewTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room-without-users.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room-without-users.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room-without-users.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room.png b/PreviewTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_createRoom.Create-Room.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_emojiPickerScreen.Screen.png b/PreviewTests/__Snapshots__/PreviewTests/test_emojiPickerScreen.Screen.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_emojiPickerScreen.Screen.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_emojiPickerScreen.Screen.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_emojiPickerScreen.Sheet.png b/PreviewTests/__Snapshots__/PreviewTests/test_emojiPickerScreen.Sheet.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_emojiPickerScreen.Sheet.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_emojiPickerScreen.Sheet.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_emojiPickerScreenHeaderView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_emojiPickerScreenHeaderView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_emojiPickerScreenHeaderView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_emojiPickerScreenHeaderView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_emoteRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_encryptedHistoryRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_encryptedHistoryRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_encryptedHistoryRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_encryptedHistoryRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_encryptedRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_estimatedWaveformView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_estimatedWaveformView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_estimatedWaveformView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_estimatedWaveformView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_fileRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_formButtonStyles.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_formButtonStyles.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_formButtonStyles.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_formButtonStyles.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_formRowLabelStyle.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_formattedBodyText.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_formattedBodyText.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_formattedBodyText.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_formattedBodyText.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_formattedBodyText.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_formattedBodyText.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_formattedBodyText.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_formattedBodyText.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_formattingToolbar.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_formattingToolbar.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_formattingToolbar.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_formattingToolbar.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_fullscreenDialog.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_globalSearchScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_globalSearchScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_globalSearchScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_globalSearchScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_globalSearchScreenListRow.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_globalSearchScreenListRow.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_globalSearchScreenListRow.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_globalSearchScreenListRow.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_heroImage.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_heroImage.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_heroImage.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_heroImage.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreen.Empty.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreen.Loaded.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loading.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreen.Loading.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Loading.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreen.Loading.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Migrating.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreen.Migrating.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreen.Migrating.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreen.Migrating.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Constrained-layout.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.Normal-Layout.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenEmptyStateView.View.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-off.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-off.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-off.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-off.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on-AX1.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on-AX1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on-AX1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on-AX1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenInvitesButton.Badge-on.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenRecoveryKeyConfirmationBanner.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenRecoveryKeyConfirmationBanner.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenRecoveryKeyConfirmationBanner.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenRecoveryKeyConfirmationBanner.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Generic.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Generic.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Generic.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Generic.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Notifications-State.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Notifications-State.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Notifications-State.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenRoomCell.Notifications-State.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_homeScreenSessionVerificationBanner.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_homeScreenSessionVerificationBanner.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_homeScreenSessionVerificationBanner.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_homeScreenSessionVerificationBanner.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_imageRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_inviteUsersScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_inviteUsersScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_inviteUsersScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_inviteUsersScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_inviteUsersScreenSelectedItem.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_inviteUsersScreenSelectedItem.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_inviteUsersScreenSelectedItem.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_inviteUsersScreenSelectedItem.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_invitesScreen.No-Invites.png b/PreviewTests/__Snapshots__/PreviewTests/test_invitesScreen.No-Invites.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_invitesScreen.No-Invites.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_invitesScreen.No-Invites.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_invitesScreen.Some-Invite.png b/PreviewTests/__Snapshots__/PreviewTests/test_invitesScreen.Some-Invite.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_invitesScreen.Some-Invite.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_invitesScreen.Some-Invite.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_invitesScreenCell.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_invitesScreenCell.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_invitesScreenCell.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_invitesScreenCell.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_legalInformationScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_legalInformationScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_legalInformationScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_legalInformationScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_locationMarkerView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Bubbles.png b/PreviewTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Bubbles.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Bubbles.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Bubbles.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_locationRoomTimelineView.Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_loginScreen.Credentials-Entered.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_loginScreen.OIDC-Fallback.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_loginScreen.Unsupported.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png b/PreviewTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_loginScreen.matrix-org.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_longPressWithFeedback.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_longPressWithFeedback.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_longPressWithFeedback.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_longPressWithFeedback.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_mapLibreStaticMapView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_mapLibreStaticMapView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_mapLibreStaticMapView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_mapLibreStaticMapView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_matrixUserPermalink.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_matrixUserPermalink.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_matrixUserPermalink.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_matrixUserPermalink.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_mediaUploadPreviewScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_mentionSuggestionItemView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageComposer.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageComposer.Replying-in-thread.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageComposer.Replying.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageForwardingScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageForwardingScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageForwardingScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageForwardingScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageText.Custom-Attachment.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageText.Custom-Attachment.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageText.Custom-Attachment.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageText.Custom-Attachment.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageText.Custom-Text.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageText.Custom-Text.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageText.Custom-Text.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageText.Custom-Text.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageText.SwiftUI-Default-Text.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageText.SwiftUI-Default-Text.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageText.SwiftUI-Default-Text.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageText.SwiftUI-Default-Text.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageText.With-block-quote.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageText.With-block-quote.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageText.With-block-quote.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageText.With-block-quote.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_messageText.With-list.png b/PreviewTests/__Snapshots__/PreviewTests/test_messageText.With-list.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_messageText.With-list.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_messageText.With-list.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_noticeRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Applying-change.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Applying-change.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Applying-change.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Applying-change.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Direct-Chats.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Direct-Chats.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Direct-Chats.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Direct-Chats.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats-Without-Disclaimer.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats-Without-Disclaimer.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats-Without-Disclaimer.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats-Without-Disclaimer.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreen.Group-Chats.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreenRoomCell.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreenRoomCell.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreenRoomCell.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsEditScreenRoomCell.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsScreen.Configuration-mismatch.png b/PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsScreen.Configuration-mismatch.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_notificationSettingsScreen.Configuration-mismatch.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_notificationSettingsScreen.Configuration-mismatch.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_onboardingScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pINTextField.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_pINTextField.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pINTextField.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pINTextField.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_paginationIndicatorRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_paginationIndicatorRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_paginationIndicatorRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_paginationIndicatorRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png b/PreviewTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pillView.All-Users.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png b/PreviewTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long-Own.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png b/PreviewTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pillView.Loaded-Long.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png b/PreviewTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pillView.Loading-Own.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading.png b/PreviewTests/__Snapshots__/PreviewTests/test_pillView.Loading.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pillView.Loading.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pillView.Loading.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_placeholderAvatarImage.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_placeholderAvatarImage.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_placeholderAvatarImage.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_placeholderAvatarImage.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_placeholderScreen.Screen.png b/PreviewTests/__Snapshots__/PreviewTests/test_placeholderScreen.Screen.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_placeholderScreen.Screen.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_placeholderScreen.Screen.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_placeholderScreen.Split-View.png b/PreviewTests/__Snapshots__/PreviewTests/test_placeholderScreen.Split-View.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_placeholderScreen.Split-View.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_placeholderScreen.Split-View.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_placeholderScreen.With-background.png b/PreviewTests/__Snapshots__/PreviewTests/test_placeholderScreen.With-background.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_placeholderScreen.With-background.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_placeholderScreen.With-background.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollFormScreen.Edit.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollFormScreen.Edit.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollFormScreen.Edit.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollFormScreen.Edit.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollFormScreen.New.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollFormScreen.New.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollFormScreen.New.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollFormScreen.New.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollOptionView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollOptionView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollOptionView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollOptionView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-disclosed-Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Creator-no-votes-Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Disclosed-Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Disclosed-Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Ended-Undisclosed-Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollRoomTimelineView.Undisclosed-Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollView.Creator-disclosed.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollView.Creator-no-votes.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Disclosed.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollView.Disclosed.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollView.Disclosed.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollView.Disclosed.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollView.Ended-Disclosed.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollView.Ended-Undisclosed.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png b/PreviewTests/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_pollView.Undisclosed.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_reactionsSummaryView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_reactionsSummaryView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_reactionsSummaryView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_reactionsSummaryView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_readMarkerRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_readMarkerRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_readMarkerRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_readMarkerRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_readReceiptCell.Loading-Member.png b/PreviewTests/__Snapshots__/PreviewTests/test_readReceiptCell.Loading-Member.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_readReceiptCell.Loading-Member.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_readReceiptCell.Loading-Member.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_readReceiptCell.No-Image.png b/PreviewTests/__Snapshots__/PreviewTests/test_readReceiptCell.No-Image.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_readReceiptCell.No-Image.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_readReceiptCell.No-Image.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_readReceiptCell.With-Image.png b/PreviewTests/__Snapshots__/PreviewTests/test_readReceiptCell.With-Image.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_readReceiptCell.With-Image.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_readReceiptCell.With-Image.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_readReceiptsSummaryView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_readReceiptsSummaryView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_readReceiptsSummaryView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_readReceiptsSummaryView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_redactedRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_redactedRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_redactedRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_redactedRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_reportContentScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_reportContentScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_reportContentScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_reportContentScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomAttachmentPicker.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomAttachmentPicker.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomAttachmentPicker.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomAttachmentPicker.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Normal.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Read-only.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Read-only.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Read-only.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsEditScreen.Read-only.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.DM-Room.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Generic-Room.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomDetailsScreen.Simple-Room.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomHeaderView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomHeaderView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomHeaderView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomHeaderView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomHeaderView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomHeaderView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomHeaderView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomHeaderView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomListFilterView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomListFilterView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomListFilterView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomListFilterView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomListFilterView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomListFilterView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomListFilterView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomListFilterView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomListFiltersView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomListFiltersView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomListFiltersView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomListFiltersView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomListFiltersView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomListFiltersView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomListFiltersView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomListFiltersView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Account-Owner.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Ignored-User.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomMemberDetailsScreen.Other-User.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListMemberCell.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Banned.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Banned.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Banned.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Banned.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Members.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Members.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Members.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Admin-Members.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Invites.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Invites.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Invites.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Invites.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Member.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Member.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Member.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomMembersListScreen.Member.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Encrypted.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Encrypted.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Encrypted.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Encrypted.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Unencrypted.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Unencrypted.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Unencrypted.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsCustomSectionView.Unencrypted.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Custom.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Custom.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Custom.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Custom.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Default.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Default.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Default.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsScreen.Default.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Encrypted.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Encrypted.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Encrypted.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Encrypted.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Unencrypted.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Unencrypted.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Unencrypted.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomNotificationSettingsUserDefinedScreen.Unencrypted.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.No-polls.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.No-polls.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.No-polls.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.No-polls.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomPollsHistoryScreen.polls.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_roomScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_roomScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_roomScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_roomScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupKeyBackupScreen.Set-up.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupLogoutConfirmationScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Incomplete.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Not-set-up.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupRecoveryKeyScreen.Set-up.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Both-setup.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Both-setup.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Both-setup.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Both-setup.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Key-backup-disabled.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Key-backup-disabled.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Key-backup-disabled.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Key-backup-disabled.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Only-key-backup-setup.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Only-key-backup-setup.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Only-key-backup-setup.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Only-key-backup-setup.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png b/PreviewTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_secureBackupScreen.Recovery-incomplete.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_separatorRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_separatorRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_separatorRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_separatorRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Login.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_serverConfirmationScreen.Register.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_serverSelection.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_serverSelection.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_serverSelection.3.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png b/PreviewTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_serverSelection.4.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png b/PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Cancelled.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png b/PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Initial.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png b/PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Request-Accepted.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png b/PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Requesting-Verification.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png b/PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Showing-Challenge.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png b/PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_sessionVerification.Verified.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_settingsScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_settingsScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_settingsScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_settingsScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_shimmerOverlay.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png b/PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.3.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png b/PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.4.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png b/PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_softLogoutScreen.5.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_splashScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_splashScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_splashScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_splashScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_startChatScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_startChatScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_startChatScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_startChatScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_stateRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_stateRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_stateRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_stateRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_stateRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_stateRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_stateRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_stateRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png b/PreviewTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.Picker.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png b/PreviewTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only-with-description.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png b/PreviewTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_staticLocationScreenViewer.View-Only.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_stickerRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_swipeRightAction.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_swipeRightAction.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_swipeRightAction.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_swipeRightAction.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_swipeToReplyView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_templateScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_templateScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_templateScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_templateScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble-RTL.png b/PreviewTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble-RTL.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble-RTL.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble-RTL.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble.png b/PreviewTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain-RTL.png b/PreviewTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain-RTL.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain-RTL.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain-RTL.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_textRoomTimelineView.Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_threadDecorator.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_threadDecorator.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_threadDecorator.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_threadDecorator.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineDeliveryStatusView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline-RTL.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Mock-Timeline.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Replies.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Replies.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Replies.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Replies.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Thread-decorator.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Thread-decorator.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Thread-decorator.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemBubbledStylerView.Thread-decorator.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemDebugView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemMenu.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemPlainStylerView.Threads.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-LTR-with-different-layout-languages.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-LTR-with-different-layout-languages.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-LTR-with-different-layout-languages.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-LTR-with-different-layout-languages.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-RTL-with-different-layout-languages.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-RTL-with-different-layout-languages.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-RTL-with-different-layout-languages.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles-RTL-with-different-layout-languages.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Bubbles.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineItemStyler.Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineReactionView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineReactionView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineReactionView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineReactionView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineReadReceiptsView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineReplyView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineStartRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineStartRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineStartRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineStartRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_timelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_timelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_timelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_timelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_typingIndicatorView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_typingIndicatorView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_typingIndicatorView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_typingIndicatorView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_uITimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_uITimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_uITimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_uITimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_unsupportedRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_userDetailsEditScreen.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.No-progress.png b/PreviewTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.No-progress.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.No-progress.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.No-progress.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.Progress-Bar.png b/PreviewTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.Progress-Bar.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.Progress-Bar.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.Progress-Bar.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.Spinner.png b/PreviewTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.Spinner.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.Spinner.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_userIndicatorModalView.Spinner.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userIndicatorToastView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_userIndicatorToastView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_userIndicatorToastView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_userIndicatorToastView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_userProfileCell.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_userProfileCell.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_userProfileCell.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_userProfileCell.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.2.png b/PreviewTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.2.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.2.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_videoRoomTimelineView.2.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageButton.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageButton.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceMessageButton.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageButton.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessagePreviewComposer.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_voiceMessagePreviewComposer.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceMessagePreviewComposer.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_voiceMessagePreviewComposer.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingButton.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingButton.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingButton.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingButton.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingComposer.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRecordingView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomPlaybackView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRoomPlaybackView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomPlaybackView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRoomPlaybackView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Bubble.png b/PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Bubble.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Bubble.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Bubble.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png b/PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_voiceMessageRoomTimelineView.Plain.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_waitingDialog.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_waitingDialog.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_waitingDialog.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_waitingDialog.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png b/PreviewTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_waitlistScreen.Success.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Waiting.png b/PreviewTests/__Snapshots__/PreviewTests/test_waitlistScreen.Waiting.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_waitlistScreen.Waiting.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_waitlistScreen.Waiting.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_waveformCursorView.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_waveformCursorView.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_waveformCursorView.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_waveformCursorView.1.png
diff --git a/UnitTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png b/PreviewTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png
similarity index 100%
rename from UnitTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png
rename to PreviewTests/__Snapshots__/PreviewTests/test_welcomeScreen.1.png
diff --git a/UnitTests/SupportingFiles/target.yml b/UnitTests/SupportingFiles/target.yml
index fbeb04021..f24d2827e 100644
--- a/UnitTests/SupportingFiles/target.yml
+++ b/UnitTests/SupportingFiles/target.yml
@@ -28,14 +28,9 @@ targets:
   UnitTests:
     type: bundle.unit-test
     platform: iOS
-    
-    buildToolPlugins:
-    - plugin: PrefireTestsPlugin
-      package: Prefire
 
     dependencies:
     - target: ElementX
-    - package: SnapshotTesting
 
     info:
       path: ../SupportingFiles/Info.plist
diff --git a/ci_scripts/ci_common.sh b/ci_scripts/ci_common.sh
index 5ee5df819..be843ada8 100755
--- a/ci_scripts/ci_common.sh
+++ b/ci_scripts/ci_common.sh
@@ -41,7 +41,7 @@ setup_github_actions_environment() {
     unset HOMEBREW_NO_INSTALL_FROM_API
     export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
     
-    brew update && brew install xcodegen swiftformat git-lfs imagemagick
+    brew update && brew install xcodegen swiftformat git-lfs imagemagick a7ex/homebrew-formulae/xcresultparser
     
     # brew "swiftlint" # Fails on the CI: `Target /usr/local/bin/swiftlint Target /usr/local/bin/swiftlint already exists`. Installed through https://github.com/actions/virtual-environments/blob/main/images/macos/macos-12-Readme.md#linters
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 237f2ca54..2448a8056 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -88,15 +88,17 @@ lane :unit_tests do
     ensure_devices_found: true,
     result_bundle: true,
     number_of_retries: 3,
+  )
+  
+  run_tests(
+    scheme: "PreviewTests",
+    device: 'iPhone 14 (16.4)',
+    result_bundle: true,
+    number_of_retries: 3,
     xcargs: '-skipPackagePluginValidation',
   )
-
-  slather(
-    cobertura_xml: true,
-    output_directory: "./fastlane/test_output",
-    proj: "ElementX.xcodeproj",
-    scheme: "UnitTests",
-  )
+  
+  # We use xcresultparser in the workflow to collect coverage from both result bundles.
 end
 
 lane :ui_tests do |options|
diff --git a/project.yml b/project.yml
index 652d89b54..90df8ed80 100644
--- a/project.yml
+++ b/project.yml
@@ -37,6 +37,7 @@ settings:
 include:
   - path: ElementX/SupportingFiles/target.yml
   - path: UnitTests/SupportingFiles/target.yml
+  - path: PreviewTests/SupportingFiles/target.yml
   - path: UITests/SupportingFiles/target.yml
   - path: IntegrationTests/SupportingFiles/target.yml
   - path: NSE/SupportingFiles/target.yml