diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d83c24fd3a..a9c356668e 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -21,7 +21,14 @@ jobs:
         cache: gradle
 
     - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
+      run: chmod +x ./gradlew
+
+    - name: Run Tests
+      run: ./gradlew test
+
+    - name: Build Project
+      run: ./gradlew assemble
+      
     - name: Build with Gradle
       run: ./gradlew build
       
diff --git a/app/build/intermediates/dex/debugAndroidTest/mergeDexDebugAndroidTest/classes.dex b/app/build/intermediates/dex/debugAndroidTest/mergeDexDebugAndroidTest/classes.dex
index af1fa8df89..efa7589012 100644
Binary files a/app/build/intermediates/dex/debugAndroidTest/mergeDexDebugAndroidTest/classes.dex and b/app/build/intermediates/dex/debugAndroidTest/mergeDexDebugAndroidTest/classes.dex differ
diff --git a/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt b/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
index 50c08a4eed..16b9e9fe1c 100644
--- a/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
+++ b/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt
@@ -1,4 +1,4 @@
-#Thu May 05 13:49:10 IST 2022
+#Thu May 05 15:45:45 IST 2022
 base.0=C\:\\Users\\kabil\\OneDrive\\Desktop\\Semester_4\\CS3042 - Database Systems\\MiniProject\\CS3042-SimpleExpenseManager\\app\\build\\intermediates\\dex\\debugAndroidTest\\mergeDexDebugAndroidTest\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex
diff --git a/app/build/intermediates/javac/debugAndroidTest/classes/lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.class b/app/build/intermediates/javac/debugAndroidTest/classes/lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.class
index e98a0b81f8..a53d55f7cf 100644
Binary files a/app/build/intermediates/javac/debugAndroidTest/classes/lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.class and b/app/build/intermediates/javac/debugAndroidTest/classes/lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.class differ
diff --git a/app/build/intermediates/javac/debugAndroidTest/classes/lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.class b/app/build/intermediates/javac/debugAndroidTest/classes/lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.class
index eb59a0bad7..b2d958c704 100644
Binary files a/app/build/intermediates/javac/debugAndroidTest/classes/lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.class and b/app/build/intermediates/javac/debugAndroidTest/classes/lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.class differ
diff --git a/app/build/intermediates/project_dex_archive/debugAndroidTest/out/lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.dex b/app/build/intermediates/project_dex_archive/debugAndroidTest/out/lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.dex
index e5819c8024..372fa14051 100644
Binary files a/app/build/intermediates/project_dex_archive/debugAndroidTest/out/lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.dex and b/app/build/intermediates/project_dex_archive/debugAndroidTest/out/lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.dex differ
diff --git a/app/build/intermediates/project_dex_archive/debugAndroidTest/out/lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.dex b/app/build/intermediates/project_dex_archive/debugAndroidTest/out/lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.dex
index 6cd3344975..50f503f075 100644
Binary files a/app/build/intermediates/project_dex_archive/debugAndroidTest/out/lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.dex and b/app/build/intermediates/project_dex_archive/debugAndroidTest/out/lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.dex differ
diff --git a/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk b/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
index 4ad5941e48..3a7412b113 100644
Binary files a/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk and b/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk differ
diff --git a/app/build/tmp/compileDebugAndroidTestJavaWithJavac/source-classes-mapping.txt b/app/build/tmp/compileDebugAndroidTestJavaWithJavac/source-classes-mapping.txt
index 57fdba20af..a530fd47fb 100644
--- a/app/build/tmp/compileDebugAndroidTestJavaWithJavac/source-classes-mapping.txt
+++ b/app/build/tmp/compileDebugAndroidTestJavaWithJavac/source-classes-mapping.txt
@@ -1,6 +1,6 @@
 lk/ac/mrt/cse/dbs/simpleexpensemanager/test/BuildConfig.java
  lk.ac.mrt.cse.dbs.simpleexpensemanager.test.BuildConfig
-lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.java
- lk.ac.mrt.cse.dbs.simpleexpensemanager.ApplicationTest
 lk/ac/mrt/cse/dbs/simpleexpensemanager/DatabaseHelperTest.java
  lk.ac.mrt.cse.dbs.simpleexpensemanager.DatabaseHelperTest
+lk/ac/mrt/cse/dbs/simpleexpensemanager/ApplicationTest.java
+ lk.ac.mrt.cse.dbs.simpleexpensemanager.ApplicationTest