diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f0318326..377ba034 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -53,6 +53,7 @@ jobs:
         sudo apt-get remove python3-typing-extensions
         sudo apt-get update
         sudo apt-get install -y python3-pip python3-dev libffi-dev libssl-dev
+        sudo apt-get remove --purge python3-typing-extensions
         sudo pip3 install python-openstackclient
 
     - name: server-id
@@ -142,7 +143,7 @@ jobs:
 
       - name: Run ffmpeg
         #send test stream to the server to play test
-        run: ffmpeg -re -stream_loop 20 -i ./webrtc-android-sample-app/src/androidTest/resources/test.flv -codec copy -f flv rtmp://test.antmedia.io/LiveApp/stream556677i4d 2>&1 < /dev/null &
+        run: ffmpeg -re -stream_loop -1 -i ./webrtc-android-sample-app/src/androidTest/resources/test.flv -codec copy -f flv rtmp://test.antmedia.io/LiveApp/stream556677i4d 2>&1 < /dev/null &
       
       - uses: browser-actions/setup-chrome@v1
         id: setup-chrome
@@ -240,6 +241,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y python3-pip python3-dev libffi-dev libssl-dev
+        sudo apt-get remove --purge python3-typing-extensions
         sudo pip3 install python-openstackclient
     - name: Delete CI Instance
       if: ${{ always() }}
diff --git a/webrtc-android-sample-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityTest.java b/webrtc-android-sample-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityTest.java
index d886813e..ad5fce2e 100644
--- a/webrtc-android-sample-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityTest.java
+++ b/webrtc-android-sample-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityTest.java
@@ -258,7 +258,7 @@ public void testJoinWithoutVideo() throws InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
-       // Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_play_stats_video_track_recyclerview))
                 .check((view, noViewFoundException) -> {
@@ -273,11 +273,11 @@ public void testJoinWithoutVideo() throws InterruptedException {
                 });
 
 
-       // Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_close_button)).perform(click());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.toggle_send_video_button)).check(matches(withText("Enable Send Video")));
         onView(withId(R.id.toggle_send_video_button)).perform(click());
@@ -289,7 +289,7 @@ public void testJoinWithoutVideo() throws InterruptedException {
 
         onView(withId(R.id.show_stats_button)).perform(click());
 
-       // Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_bytes_sent_video_textview)).check((view, noViewFoundException) -> {
             String text = ((TextView) view).getText().toString();
@@ -300,11 +300,11 @@ public void testJoinWithoutVideo() throws InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
-       // Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_close_button)).perform(click());
 
-      //  Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.join_conference_button)).perform(click());
 
@@ -413,7 +413,7 @@ public void testConferenceReconnect() throws IOException, InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
-        //Thread.sleep(5000);
+        Thread.sleep(5000);
         onView(withId(R.id.multitrack_stats_popup_play_stats_video_track_recyclerview)).inRoot(isDialog()).check(matches(isDisplayed()));
 
         onView(withId(R.id.multitrack_stats_popup_play_stats_video_track_recyclerview))
@@ -431,7 +431,7 @@ public void testConferenceReconnect() throws IOException, InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_close_button)).perform(click());
 
diff --git a/webrtc-android-sample-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityWithDifferentVideoSourcesTest.java b/webrtc-android-sample-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityWithDifferentVideoSourcesTest.java
index 8af7b2b8..082fa400 100644
--- a/webrtc-android-sample-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityWithDifferentVideoSourcesTest.java
+++ b/webrtc-android-sample-app/src/androidTest/java/io/antmedia/webrtc_android_sample_app/ConferenceActivityWithDifferentVideoSourcesTest.java
@@ -150,7 +150,7 @@ public void testConferenceSwitchStreamSource() throws InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_close_button)).perform(click());
 
@@ -180,11 +180,11 @@ public void testConferenceSwitchStreamSource() throws InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_close_button)).perform(click());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
 
         onView(withId(R.id.front_camera_button)).perform(click());
@@ -209,11 +209,11 @@ public void testConferenceSwitchStreamSource() throws InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_close_button)).perform(click());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.rear_camera_button)).perform(click());
 
@@ -236,11 +236,13 @@ public void testConferenceSwitchStreamSource() throws InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
+        Thread.sleep(3000);
+
         onView(withId(R.id.stats_popup_container)).perform(waitFor(2000));
 
         onView(withId(R.id.multitrack_stats_popup_close_button)).perform(click());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.join_conference_button)).perform(click());
 
@@ -258,11 +260,11 @@ public void testConferenceSwitchStreamSource() throws InterruptedException {
         onView(withId(R.id.broadcasting_text_view))
                 .check(matches(withText(R.string.live)));
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.show_stats_button)).perform(click());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         //after source switch video sending should continue.
         onView(withId(R.id.multitrack_stats_popup_bytes_sent_video_textview)).check((view, noViewFoundException) -> {
@@ -274,7 +276,7 @@ public void testConferenceSwitchStreamSource() throws InterruptedException {
 
         onView(withId(R.id. stats_popup_container)).perform(swipeUp());
 
-        //Thread.sleep(3000);
+        Thread.sleep(3000);
 
         onView(withId(R.id.multitrack_stats_popup_close_button)).perform(click());