diff --git a/app/src/main/java/h_mal/appttude/com/driver/data/Roles.kt b/app/src/main/java/h_mal/appttude/com/driver/data/Roles.kt
index 4231fee..3dd629e 100644
--- a/app/src/main/java/h_mal/appttude/com/driver/data/Roles.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/data/Roles.kt
@@ -1,4 +1,4 @@
 package h_mal.appttude.com.driver.data
 
 const val DRIVER = "driver"
-const val ADMIN = "super_user"
\ No newline at end of file
+const val ADMIN = "admin"
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/driver/utils/ActivityIntentBuilder.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/ActivityIntentBuilder.kt
deleted file mode 100644
index 0da57af..0000000
--- a/app/src/main/java/h_mal/appttude/com/driver/utils/ActivityIntentBuilder.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package h_mal.appttude.com.driver.utils
-
-import android.content.Context
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-
-object ActivityIntentBuilder {
-
-    inline fun <reified T : AppCompatActivity> Context.createIntent(): Intent =
-        Intent(this, T::class.java)
-
-    inline fun <reified T : AppCompatActivity> Fragment.createIntent() =
-        requireContext().createIntent<T>()
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/h_mal/appttude/com/driver/utils/DateUtils.kt b/app/src/main/java/h_mal/appttude/com/driver/utils/DateUtils.kt
index ed2d5bd..c8fef1f 100644
--- a/app/src/main/java/h_mal/appttude/com/driver/utils/DateUtils.kt
+++ b/app/src/main/java/h_mal/appttude/com/driver/utils/DateUtils.kt
@@ -6,10 +6,6 @@ import java.text.SimpleDateFormat
 import java.util.*
 
 object DateUtils {
-    fun getDateStamp(): String {
-        val sdf: SimpleDateFormat = getSimpleDateFormat("yyyyMMdd_HHmm")
-        return sdf.format(Date())
-    }
 
     fun getDateTimeStamp(): String {
         val sdf: SimpleDateFormat = getSimpleDateFormat("yyyyMMdd_HHmmss")
@@ -21,7 +17,7 @@ object DateUtils {
         return try {
             val sdfIn = getSimpleDateFormat(formatIn)
             val sdfOut = getSimpleDateFormat(formatOut)
-            val newDate: Date = sdfIn.parse(this)
+            val newDate = sdfIn.parse(this)
             sdfOut.format(newDate)
         } catch (e: Exception) {
             e.printStackTrace()
diff --git a/app/src/testDebug/java/h_mal/appttude/com/driver/utils/DateUtilsTest.kt b/app/src/testDebug/java/h_mal/appttude/com/driver/utils/DateUtilsTest.kt
new file mode 100644
index 0000000..e4ecf26
--- /dev/null
+++ b/app/src/testDebug/java/h_mal/appttude/com/driver/utils/DateUtilsTest.kt
@@ -0,0 +1,36 @@
+package h_mal.appttude.com.driver.utils
+
+import h_mal.appttude.com.driver.utils.DateUtils.convertDateStringDatePattern
+import org.junit.Assert.*
+import org.junit.Test
+
+class DateUtilsTest {
+
+    @Test
+    fun test_getDateTimeStamp() {
+        val regex1 = "[0-9]{8}_[0-9]{6}".toRegex()
+        val date = DateUtils.getDateTimeStamp()
+        assertTrue(regex1 matches date)
+    }
+
+    @Test
+    fun test_convertDateStringDatePattern() {
+        val inDate = "12/12/2020"
+        val outDate1 = inDate.convertDateStringDatePattern("dd/MM/yyyy", "yyyyMMdd_HHmmss")
+        val regex1 = "[0-9]{8}_[0-9]{6}".toRegex()
+        assertTrue(regex1 matches outDate1)
+
+        // failed match in
+        val outDate2 = inDate.convertDateStringDatePattern("yyyy-MM-dd HH:mm:ss", "yyyyMMdd_HHmmss")
+        assertFalse(regex1 matches outDate2)
+        assertEquals(inDate, outDate2)
+    }
+
+    @Test
+    fun test_parseDateStringIntoCalender() {
+    }
+
+    @Test
+    fun test_parseCalenderIntoDateString() {
+    }
+}
\ No newline at end of file