diff --git a/app/src/test/kotlin/fr/free/nrw/commons/upload/FileMetadataUtilsTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/upload/FileMetadataUtilsTest.kt
index 6dde026a9..bfbcdb478 100644
--- a/app/src/test/kotlin/fr/free/nrw/commons/upload/FileMetadataUtilsTest.kt
+++ b/app/src/test/kotlin/fr/free/nrw/commons/upload/FileMetadataUtilsTest.kt
@@ -11,13 +11,81 @@ import java.util.*
 class FileMetadataUtilsTest {
 
     /**
-     * Test method to verify EXIF tags
+     * Test method to verify EXIF tags for "Author"
      */
     @Test
-    fun getTagsFromPref() {
+    fun getTagsFromPrefAuthor() {
         val author = FileMetadataUtils.getTagsFromPref("Author")
         val authorRef = arrayOf(TAG_ARTIST, TAG_CAMARA_OWNER_NAME);
 
         assertTrue(Arrays.deepEquals(author, authorRef))
     }
+
+    /**
+     * Test method to verify EXIF tags for  "Location"
+     */
+    @Test
+    fun getTagsFromPrefLocation() {
+        val author = FileMetadataUtils.getTagsFromPref("Location")
+        val authorRef = arrayOf(TAG_GPS_LATITUDE, TAG_GPS_LATITUDE_REF,
+                TAG_GPS_LONGITUDE, TAG_GPS_LONGITUDE_REF,
+                TAG_GPS_ALTITUDE, TAG_GPS_ALTITUDE_REF)
+
+        assertTrue(Arrays.deepEquals(author, authorRef))
+    }
+
+    /**
+     * Test method to verify EXIF tags for  "Copyright"
+     */
+    @Test
+    fun getTagsFromPrefCopyWright() {
+        val author = FileMetadataUtils.getTagsFromPref("Copyright")
+        val authorRef = arrayOf(TAG_COPYRIGHT)
+
+        assertTrue(Arrays.deepEquals(author, authorRef))
+    }
+
+    /**
+     * Test method to verify EXIF tags for  "Camera Model"
+     */
+    @Test
+    fun getTagsFromPrefCameraModel() {
+        val author = FileMetadataUtils.getTagsFromPref("Camera Model")
+        val authorRef = arrayOf(TAG_MAKE, TAG_MODEL)
+
+        assertTrue(Arrays.deepEquals(author, authorRef))
+    }
+
+    /**
+     * Test method to verify EXIF tags for  "Lens Model"
+     */
+    @Test
+    fun getTagsFromPrefLensModel() {
+        val author = FileMetadataUtils.getTagsFromPref("Lens Model")
+        val authorRef = arrayOf(TAG_LENS_MAKE, TAG_LENS_MODEL, TAG_LENS_SPECIFICATION)
+
+        assertTrue(Arrays.deepEquals(author, authorRef))
+    }
+
+    /**
+     * Test method to verify EXIF tags for  "Serial Numbers"
+     */
+    @Test
+    fun getTagsFromPrefSerialNumbers() {
+        val author = FileMetadataUtils.getTagsFromPref("Serial Numbers")
+        val authorRef = arrayOf(TAG_BODY_SERIAL_NUMBER, TAG_LENS_SERIAL_NUMBER)
+
+        assertTrue(Arrays.deepEquals(author, authorRef))
+    }
+
+    /**
+     * Test method to verify EXIF tags for  "Software"
+     */
+    @Test
+    fun getTagsFromPrefSoftware() {
+        val author = FileMetadataUtils.getTagsFromPref("Software")
+        val authorRef = arrayOf(TAG_SOFTWARE)
+
+        assertTrue(Arrays.deepEquals(author, authorRef))
+    }
 }
\ No newline at end of file