diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..41b5dfcdc4e8d4ac3162fc139634f7e9ba7d4c8a
Binary files /dev/null and b/.DS_Store differ
diff --git a/Labs/.DS_Store b/Labs/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3a8ff575c8ccdd91ca49472e2dd69641d5414d61
Binary files /dev/null and b/Labs/.DS_Store differ
diff --git a/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/NewFeedTest.kt b/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/NewFeedTest.kt
deleted file mode 100644
index ec776f61c4a508784c9e8fc8230145f1f2edde9f..0000000000000000000000000000000000000000
--- a/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/NewFeedTest.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-package course.labs.notificationslab.tests
-
-import android.test.ActivityInstrumentationTestCase2
-import android.view.View
-import com.robotium.solo.Solo
-import course.labs.notificationslab.MainActivity
-import course.labs.notificationslab.R
-import course.labs.notificationslab.TestFrontEndActivity
-import junit.framework.Assert
-
-class NewFeedTest : ActivityInstrumentationTestCase2<TestFrontEndActivity>(TestFrontEndActivity::class.java) {
-    private var solo: Solo? = null
-    @Throws(Exception::class)
-    override fun setUp() {
-        solo = Solo(instrumentation, activity)
-    }
-
-    @Throws(Exception::class)
-    override fun tearDown() {
-        solo!!.finishOpenedActivities()
-    }
-
-    fun testRun() {
-        val shortDelay = 5000
-        val longDelay = 10000
-
-        // Wait for activity:
-        // 'course.labs.notificationslab.TestFrontEndActivity'
-        solo!!.waitForActivity(
-                TestFrontEndActivity::class.java,
-                shortDelay)
-
-        // Click on Make Tweets New
-        solo!!.clickOnView(solo!!
-                .getView(R.id.rejuv_tweets_button))
-
-        // Click on Start Main Activity
-        solo!!.clickOnView(solo!!
-                .getView(R.id.start_main_button))
-
-        // Wait for activity:
-        // 'course.labs.threadslab.MainActivity'
-        solo!!.waitForActivity(MainActivity::class.java,
-                shortDelay)
-        val msg = activity.getString(R.string.download_in_progress_string)
-        assertFalse("'$msg	' is shown!",
-                solo!!.searchText(msg))
-        solo!!.waitForView(android.R.id.list)
-        val listView = solo!!.getView(android.R.id.list)
-        solo!!.waitForCondition({ listView.isEnabled }, longDelay)
-
-        // Click on ladygaga
-        solo!!.clickOnView(solo!!.getView(android.R.id.text1))
-
-        // Assert that: 'feed_view' is shown
-        assertTrue("feed_view not shown!", solo!!.waitForView<View?>(solo!!
-                .getView(R.id.feed_view)))
-
-        // Assert that: 'Taylor Swift' is shown
-        Assert.assertTrue("'Lady Gaga' is not shown!",
-                solo!!.searchText("Lady Gaga"))
-    }
-}
\ No newline at end of file
diff --git a/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/OldFeedNoNotificationTest.kt b/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/OldFeedNoNotificationTest.kt
deleted file mode 100644
index 86d7aed057729b2d21910ffcc9237fa910b39952..0000000000000000000000000000000000000000
--- a/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/OldFeedNoNotificationTest.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-package course.labs.notificationslab.tests
-
-import android.test.ActivityInstrumentationTestCase2
-import android.view.View
-import com.robotium.solo.Solo
-import course.labs.notificationslab.MainActivity
-import course.labs.notificationslab.R
-import course.labs.notificationslab.TestFrontEndActivity
-
-class OldFeedNoNotificationTest : ActivityInstrumentationTestCase2<TestFrontEndActivity>(TestFrontEndActivity::class.java) {
-    private var solo: Solo? = null
-    @Throws(Exception::class)
-    override fun setUp() {
-        solo = Solo(instrumentation, activity)
-    }
-
-    @Throws(Exception::class)
-    override fun tearDown() {
-        solo!!.finishOpenedActivities()
-    }
-
-    fun testRun() {
-        val shortDelay = 2000
-        val longDelay = 10000
-
-        // Wait for activity:
-        // 'course.labs.notificationslab.TestFrontEndActivity'
-        solo!!.waitForActivity(
-                TestFrontEndActivity::class.java, shortDelay)
-
-        // Click on Make Tweets Old
-        solo!!.clickOnView(solo!!
-                .getView(R.id.age_tweets_button))
-
-        // Click on Start Main Activty
-        solo!!.clickOnView(solo!!
-                .getView(R.id.start_main_button))
-
-        // Wait for activity: 'course.labs.notificationslab.MainActivity'
-        assertTrue("course.labs.notificationslab.MainActivity is not found!",
-                solo!!.waitForActivity(
-                        MainActivity::class.java, shortDelay))
-
-        // Assert that: Toast message is shown
-        val msg = activity.getString(R.string.download_in_progress_string)
-        assertTrue("'$msg	' is not shown!",
-                solo!!.searchText(msg))
-        solo!!.waitForView(android.R.id.list)
-        val listView = solo!!.getView(android.R.id.list)
-        solo!!.waitForCondition({ listView.isEnabled }, longDelay)
-        val failMsg = activity.getString(R.string.download_failed_string)
-        val successMsg = activity.getString(R.string.download_succes_string)
-        assertTrue("Toast message did not appear", solo!!.searchText("($failMsg|$successMsg)"))
-
-        // Click on ladygaga
-        solo!!.clickOnView(solo!!.getView(android.R.id.text1))
-
-        // Assert that: 'feed_view' is shown
-        assertTrue("feed_view' is not shown!", solo!!.waitForView<View?>(solo!!
-                .getView(R.id.feed_view)))
-    }
-}
\ No newline at end of file
diff --git a/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/OldFeedWithNotificationTest.kt b/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/OldFeedWithNotificationTest.kt
deleted file mode 100644
index d243570e56756a030e9fb0752f3e51c88129ff11..0000000000000000000000000000000000000000
--- a/Labs/Lab6_NotificationsLab/app/src/androidTest/java/course/labs/notificationslab/tests/OldFeedWithNotificationTest.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package course.labs.notificationslab.tests
-
-import android.test.ActivityInstrumentationTestCase2
-import com.robotium.solo.Solo
-import course.labs.notificationslab.TestFrontEndActivity
-
-class OldFeedWithNotificationTest : ActivityInstrumentationTestCase2<TestFrontEndActivity>(TestFrontEndActivity::class.java) {
-    private var solo: Solo? = null
-    @Throws(Exception::class)
-    override fun setUp() {
-        solo = Solo(instrumentation)
-        activity
-    }
-
-    @Throws(Exception::class)
-    override fun tearDown() {
-        solo!!.finishOpenedActivities()
-    }
-
-}
\ No newline at end of file