diff --git a/app/views/users/footer/footer.scala.html b/app/views/users/footer/footer.scala.html
index bfbec61..795cb49 100644
--- a/app/views/users/footer/footer.scala.html
+++ b/app/views/users/footer/footer.scala.html
@@ -1,5 +1,5 @@
 @(param: Any)
-<nav>
+<nav id="footer">
 	<div class="container-fluid" style="text-align: center; background: #E3E6E5; height: 50px; padding: 10px; margin-bottom: -60px;">
 		<p  style="color: rgba(122, 27, 27, 1);">Copyright © Knoldus Software LLP, Inc. 2013</p>
 	</div>
diff --git a/app/views/users/main.scala.html b/app/views/users/main.scala.html
index 782dc7f..7e075ae 100644
--- a/app/views/users/main.scala.html
+++ b/app/views/users/main.scala.html
@@ -17,7 +17,9 @@
 
     <!-- Custom CSS -->
     <link href="@routes.Assets.at("user/css/agency.css")" rel="stylesheet">
-
+	<!-- sticky sidebar CSS -->
+	    <!-- Custom CSS -->
+    <link href="@routes.Assets.at("user/mycss/stickySidebar.css")" rel="stylesheet">
     <!-- Custom Fonts -->
     <link href="@routes.Assets.at("user/font-awesome/css/font-awesome.min.css")" rel="stylesheet" type="text/css">
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
@@ -26,10 +28,21 @@
     <link href='https://fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700' rel='stylesheet' type='text/css'>
 </head>
 <body id="page-top" class="index">
+<!-- Sticky Side Bar -->
+<div id="sidebar">
+    <h6>Connect with Us</h6>
+    <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.com/mycellwasstolen" data-via="mycellwasstolen" data-size="large">Tweet</a>
+	<script src="@routes.Assets.at("user/js/myscript/tweetWithCount.js")"></script>
+<!-- Place this tag in your head or just before your close body tag. -->
+<script src="https://apis.google.com/js/platform.js" async defer></script>
+<!-- Place this tag where you want the share button to render. -->
+<div class="g-plus" data-action="share" data-annotation="vertical-bubble" data-height="60" data-href="https://plus.google.com/111233132925524877427/about"></div>    
+</div>
+  <!-- Navigation bars -->
     <nav class="navbar navbar-default navbar-fixed-top">
         <div class="container">
             <!-- Brand and toggle get grouped for better mobile display -->
-            <div class="navbar-header page-scroll">
+            <div class="navbar-header pagae-scroll">
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
                     <span class="sr-only">Toggle navigation</span>
                     <span class="icon-bar"></span>
@@ -70,7 +83,6 @@
         <div class="container" style="box-shadow: 10px 5px 5px 5px #C0B6B6;padding: 10px;">
         <div class="row">
         <div class="col-md-9">
-	
 	<div id="myCarousel" class="carousel slide" style="margin-top: -125px;">
   <div class="carousel-inner">
     <div class="active item">
@@ -113,13 +125,13 @@ <h5 style="text-align: center; color: rgba(239, 0, 0, 1);display: inline; ">My c
 </div></div>
 		   </div>
 		   <hr>
-		   
         <div class="input-group" style="width: 250px;">
       <input type="text" class="form-control" placeholder="Search for this site...">
       <span class="input-group-btn">
         <button class="btn btn-primary" type="button">Search</button>
       </span>
     </div><hr>
+<<<<<<< HEAD
     <img src="@routes.Assets.at("user/img/map.jpg")" alt="...">
     <hr>
     <!-- Render Twitter Feed Widget -->
@@ -182,7 +194,6 @@ <h5>For any further information write to us</h5><br>
             </div>
         </div>
     </footer>
-
     <!-- jQuery -->
     
 
@@ -205,5 +216,9 @@ <h5>For any further information write to us</h5><br>
 	   $('#example').vTicker();
 	 });
    </script> 
+	<!-- Sticky Side bar plugin -->
+   <script src="@routes.Assets.at("user/js/stickyMojo.js")"></script>
+   <!-- sticky Side bar initialization -->
+   <script src="@routes.Assets.at("user/js/myscript/stickySideInit.js")"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/public/user/js/myscript/stickySideInit.js b/public/user/js/myscript/stickySideInit.js
new file mode 100644
index 0000000..3b346cf
--- /dev/null
+++ b/public/user/js/myscript/stickySideInit.js
@@ -0,0 +1,3 @@
+/**
+ * Initializes the sticky side bar
+ */
diff --git a/public/user/js/myscript/tweetWithCount.js b/public/user/js/myscript/tweetWithCount.js
new file mode 100644
index 0000000..8e29bdf
--- /dev/null
+++ b/public/user/js/myscript/tweetWithCount.js
@@ -0,0 +1,13 @@
+/**
+ * Contains script generated by twitter API
+ */
+!function(d, s, id) {
+	var js, fjs = d.getElementsByTagName(s)[0], p = /^http:/.test(d.location) ? 'http'
+			: 'https';
+	if (!d.getElementById(id)) {
+		js = d.createElement(s);
+		js.id = id;
+		js.src = p + '://platform.twitter.com/widgets.js';
+		fjs.parentNode.insertBefore(js, fjs);
+	}
+}(document, 'script', 'twitter-wjs');
\ No newline at end of file
diff --git a/public/user/js/stickyMojo.js b/public/user/js/stickyMojo.js
new file mode 100644
index 0000000..139eb86
--- /dev/null
+++ b/public/user/js/stickyMojo.js
@@ -0,0 +1,142 @@
+(function($) {
+  $.fn.extend({
+    stickyMojo: function(options) {
+
+      // Exit if there are no elements to avoid errors:
+      if (this.length === 0) {
+        return this;
+      }
+
+      var settings = $.extend({
+        'footerID': '',
+        'contentID': '',
+        'orientation': $(this).css('float'),
+        'offsetTop': 0
+      }, options);
+
+      var sticky = {
+        'el': $(this),
+        'stickyLeft': $(settings.contentID).outerWidth() + $(settings.contentID).offset.left,
+        'stickyTop2': $(this).offset().top,
+        'stickyHeight': $(this).outerHeight(true),
+        'contentHeight': $(settings.contentID).outerHeight(true),
+        'win': $(window),
+        'breakPoint': $(this).outerWidth(true) + $(settings.contentID).outerWidth(true),
+        'marg': parseInt($(this).css('margin-top'), 10)
+      };
+
+      var errors = checkSettings();
+      cacheElements();
+
+      return this.each(function() {
+        buildSticky();
+      });
+
+      function buildSticky() {
+        if (!errors.length) {
+          sticky.el.css('left', sticky.stickyLeft);
+
+          sticky.win.bind({
+            'load': stick,
+            'scroll': stick,
+            'resize': function() {
+              sticky.el.css('left', sticky.stickyLeft);
+              stick();
+            }
+          });
+        } else {
+          if (console && console.warn) {
+            console.warn(errors);
+          } else {
+            alert(errors);
+          }
+        }
+      }
+
+      // Caches the footer and content elements into jquery objects
+      function cacheElements() {
+        settings.footerID = $(settings.footerID);
+        settings.contentID = $(settings.contentID);
+      }
+
+      //  Calcualtes the limits top and bottom limits for the sidebar
+      function calculateLimits() {
+        return {
+          limit: settings.footerID.offset().top - sticky.stickyHeight,
+          windowTop: sticky.win.scrollTop(),
+          stickyTop: sticky.stickyTop2 - sticky.marg
+        }
+      }
+
+      // Sets sidebar to fixed position
+      function setFixedSidebar() {
+        sticky.el.css({
+          position: 'fixed',
+          top: settings.offsetTop+'px'
+        });
+      }
+
+      // Determines the sidebar orientation and sets margins accordingly
+      function checkOrientation() {
+        if (settings.orientation === "left") {
+          settings.contentID.css('margin-left', sticky.el.outerWidth(true));
+        } else {
+          sticky.el.css('margin-left', settings.contentID.outerWidth(true));
+        }
+      }
+
+      // sets sidebar to a static positioned element
+      function setStaticSidebar() {
+        sticky.el.css({
+          'position': 'static',
+          'margin-left': '0px'
+        });
+        settings.contentID.css('margin-left', '0px');
+      }
+
+      // initiated to stop the sidebar from intersecting the footer
+      function setLimitedSidebar(diff) {
+        sticky.el.css({
+          top: diff
+        });
+      }
+
+      //determines whether sidebar should stick and applies appropriate settings to make it stick
+      function stick() {
+        var tops = calculateLimits();
+        var hitBreakPoint = tops.stickyTop < tops.windowTop + settings.offsetTop && (sticky.win.width() >= sticky.breakPoint);
+        if (hitBreakPoint) {
+          setFixedSidebar();
+          checkOrientation();
+        } else {
+          setStaticSidebar();
+        }
+        if (tops.limit < tops.windowTop) {
+          var diff = tops.limit - tops.windowTop;
+          setLimitedSidebar(diff);
+        }
+      }
+
+      // verifies that all settings are correct
+      function checkSettings() {
+        var errors = [];
+        for (var key in settings) {
+          if (!settings[key]) {
+            errors.push(settings[key]);
+          }
+        }
+        ieVersion() && errors.push("NO IE 7");
+        return errors;
+      }
+
+      function ieVersion() {
+        if(document.querySelector) {
+          return false;
+        }
+        else {
+          return true;
+        }
+      }
+    }
+  });
+})(jQuery);
diff --git a/public/user/mycss/stickySidebar.css b/public/user/mycss/stickySidebar.css
new file mode 100644
index 0000000..c7b8340
--- /dev/null
+++ b/public/user/mycss/stickySidebar.css
@@ -0,0 +1,11 @@
+@CHARSET "UTF-8";
+
+#sidebar {
+    float: left;
+    width: 150px;
+    height: 300px;
+    border: 0px solid #000;
+    position: fixed;
+    z-index:1;
+    margin-top:150px;
+}
diff --git a/stickySidebar.css b/stickySidebar.css
new file mode 100644
index 0000000..91d02f2
--- /dev/null
+++ b/stickySidebar.css
@@ -0,0 +1,9 @@
+@CHARSET "UTF-8";
+#sidebar {
+  width: 120px;
+  background-color: #ccc;
+  min-height: 200px;
+  margin: 10px 0 15px 0; /*controls the cutoff of the top and bottom limitations*/
+  padding: 15px 10px;
+  float: left; /* float right for a right aligned sidebar */
+}
\ No newline at end of file
diff --git a/test/automation/ApprovingUserRequestTest.scala b/test/automation/ApprovingUserRequestTest.scala
new file mode 100644
index 0000000..6374fca
--- /dev/null
+++ b/test/automation/ApprovingUserRequestTest.scala
@@ -0,0 +1,60 @@
+package automation
+
+import scala.slick.driver.PostgresDriver.simple._
+import org.specs2.mutable.Specification
+import play.api.test.WithServer
+import play.api.libs.ws.WS
+import play.api.test.Helpers._
+import play.api.test.Helpers.await
+import play.api.test.TestServer
+import play.api.test.WithServer
+import utils.Connection
+import java.util.concurrent.TimeUnit
+import org.openqa.selenium.support.ui.Select
+import play.api.test.FakeApplication
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.By
+import org.openqa.selenium.WebElement
+
+class ApprovingUserRequestTest extends Specification {
+  val port = 19001
+  val baseUrl = "http://localhost:19001"
+
+  "Approving a request" in {
+    running(TestServer(port, FakeApplication(additionalConfiguration = inMemoryDatabase())), HTMLUNIT) { browser =>
+      val driver = new FirefoxDriver
+      driver.manage().window().maximize()
+      driver.get(baseUrl + "/login")
+      driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS)
+      driver.findElementById("email").sendKeys("test")
+      driver.findElementById("password").sendKeys("test")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("menuItem").click
+      driver.findElementById("brandForm").click
+      driver.findElementById("name").sendKeys("nokia")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementByCssSelector(".panel-title").getText.contains("Brand successfully added")
+      driver.findElementById("menuItem").click
+      driver.findElementById("createMobileModel").click
+      new Select(driver.findElementById("brandName")).selectByVisibleText("nokia")
+      driver.findElementById("modelName").sendKeys("Asha 200")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("stolenPhone").click
+      driver.findElementById("userName").sendKeys("manish")
+      new Select(driver.findElementById("brandId")).selectByVisibleText("nokia")
+      new Select(driver.findElementById("mobileModelId")).selectByVisibleText("Asha 200")
+      driver.findElementById("email").sendKeys("reseamanish@gmail.com")
+      driver.findElementById("imeiMeid").sendKeys("123456789012347")
+      driver.executeScript("""document.getElementById("purchaseDate").value="03/03/2014";""")
+      driver.findElementById("contactNo").sendKeys("+91 1234567890")
+      driver.findElementById("description").sendKeys("selenium test desc")
+      driver.findElementById("fileUpload").sendKeys("/home/knoldus/Pictures/selenium.png")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS)
+      driver.findElementById("menuItem").click
+      driver.findElementById("listOfRequest").click
+      driver.findElementById("approve").click
+      driver.findElementByCssSelector("BODY").getText().contains("Mobile has been approved successfully!")
+    }
+  }
+}
diff --git a/test/automation/BrandInsertionTest.scala b/test/automation/BrandInsertionTest.scala
new file mode 100644
index 0000000..11c8d6b
--- /dev/null
+++ b/test/automation/BrandInsertionTest.scala
@@ -0,0 +1,37 @@
+package automation
+
+import scala.slick.driver.PostgresDriver.simple._
+import org.specs2.mutable.Specification
+import play.api.test.WithServer
+import play.api.libs.ws.WS
+import play.api.test.Helpers._
+import play.api.test.Helpers.await
+import play.api.test.TestServer
+import play.api.test.WithServer
+import utils.Connection
+import java.util.concurrent.TimeUnit
+import org.openqa.selenium.support.ui.Select
+import play.api.test.FakeApplication
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.By
+import org.openqa.selenium.WebElement
+
+class BrandInsertionTest extends Specification {
+  val port = 19001
+  val baseUrl = "http://localhost:19001"
+
+  "Testing Add Mobile Brand" in {
+    running(TestServer(port), FIREFOX) { browser =>
+      browser.webDriver.manage().window().maximize()
+      browser.goTo(baseUrl + "/login")
+      browser.$("#email").text("test")
+      browser.$("#password").text("test")
+      browser.$(".btn.btn-primary").click
+      browser.$("#menuItem").click
+      browser.$("#brandForm").click
+      browser.$("#name").text("nokia")
+      browser.$(".btn.btn-primary").click
+      browser.$(".alert.alert-dismissable.alert-success").getText() must contain("Brand successfully added")
+    }
+  }
+}
diff --git a/test/automation/ChangeRegistrationTypeStolenToCleanTest.scala b/test/automation/ChangeRegistrationTypeStolenToCleanTest.scala
new file mode 100644
index 0000000..835ed56
--- /dev/null
+++ b/test/automation/ChangeRegistrationTypeStolenToCleanTest.scala
@@ -0,0 +1,62 @@
+package automation
+
+import scala.slick.driver.PostgresDriver.simple._
+import org.specs2.mutable.Specification
+import play.api.test.WithServer
+import play.api.libs.ws.WS
+import play.api.test.Helpers._
+import play.api.test.Helpers.await
+import play.api.test.TestServer
+import play.api.test.WithServer
+import utils.Connection
+import java.util.concurrent.TimeUnit
+import org.openqa.selenium.support.ui.Select
+import play.api.test.FakeApplication
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.By
+import org.openqa.selenium.WebElement
+
+class ChangeRegistrationTypeStolenToCleanTest extends Specification {
+  val port = 19001
+  val baseUrl = "http://localhost:19001"
+
+  "Change Registration Type from stolen to clean" in {
+    running(TestServer(port, FakeApplication(additionalConfiguration = inMemoryDatabase())), HTMLUNIT) { browser =>
+      val driver = new FirefoxDriver
+      driver.manage().window().maximize()
+      driver.get(baseUrl + "/login")
+      driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS)
+      driver.findElementById("email").sendKeys("test")
+      driver.findElementById("password").sendKeys("test")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("menuItem").click
+      driver.findElementById("brandForm").click
+      driver.findElementById("name").sendKeys("nokia")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementByCssSelector(".panel-title").getText.contains("Brand successfully added")
+      driver.findElementById("menuItem").click
+      driver.findElementById("createMobileModel").click
+      new Select(driver.findElementById("brandName")).selectByVisibleText("nokia")
+      driver.findElementById("modelName").sendKeys("Asha 200")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("stolenPhone").click
+      driver.findElementById("userName").sendKeys("manish")
+      new Select(driver.findElementById("brandId")).selectByVisibleText("nokia")
+      new Select(driver.findElementById("mobileModelId")).selectByVisibleText("Asha 200")
+      driver.findElementById("email").sendKeys("reseamanish@gmail.com")
+      driver.findElementById("imeiMeid").sendKeys("123456789012347")
+      driver.executeScript("""document.getElementById("purchaseDate").value="03/03/2014";""")
+      driver.findElementById("contactNo").sendKeys("+91 1234567890")
+      driver.findElementById("description").sendKeys("selenium test desc")
+      driver.findElementById("fileUpload").sendKeys("/home/knoldus/Pictures/selenium.png")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS)
+      driver.findElementById("menuItem").click
+      driver.findElementById("changeCellStatus").click
+      driver.findElementById("imeiMeid").sendKeys("123456789012347")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("changeRegType").click
+      driver.findElementByCssSelector("BODY").getText().contains("Check Status")
+    }
+  }
+}
diff --git a/test/automation/HomePageTest.scala b/test/automation/HomePageTest.scala
new file mode 100644
index 0000000..f2688aa
--- /dev/null
+++ b/test/automation/HomePageTest.scala
@@ -0,0 +1,30 @@
+package automation
+
+import scala.slick.driver.PostgresDriver.simple._
+import org.specs2.mutable.Specification
+import play.api.test.WithServer
+import play.api.libs.ws.WS
+import play.api.test.Helpers._
+import play.api.test.Helpers.await
+import play.api.test.TestServer
+import play.api.test.WithServer
+import utils.Connection
+import java.util.concurrent.TimeUnit
+import org.openqa.selenium.support.ui.Select
+import play.api.test.FakeApplication
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.By
+import org.openqa.selenium.WebElement
+
+class HomePageTest extends Specification {
+  val port = 19001
+  val baseUrl = "http://localhost:19001"
+
+  "Testing Home Page" in {
+    running(TestServer(port), FIREFOX) { browser =>
+      browser.webDriver.manage().window().maximize()
+      browser.goTo(baseUrl)
+      browser.title() must equalTo("Welcome to MCWS")
+    }
+  }
+}
diff --git a/test/automation/ModelInsertionTest.scala b/test/automation/ModelInsertionTest.scala
new file mode 100644
index 0000000..ab63491
--- /dev/null
+++ b/test/automation/ModelInsertionTest.scala
@@ -0,0 +1,45 @@
+package automation
+
+import scala.slick.driver.PostgresDriver.simple._
+import org.specs2.mutable.Specification
+import play.api.test.WithServer
+import play.api.libs.ws.WS
+import play.api.test.Helpers._
+import play.api.test.Helpers.await
+import play.api.test.TestServer
+import play.api.test.WithServer
+import utils.Connection
+import java.util.concurrent.TimeUnit
+import org.openqa.selenium.support.ui.Select
+import play.api.test.FakeApplication
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.By
+import org.openqa.selenium.WebElement
+
+class ModelInsertionTest extends Specification {
+  val port = 19001
+  val baseUrl = "http://localhost:19001"
+
+  "Testing Add  Mobile Model" in {
+    running(TestServer(port, FakeApplication(additionalConfiguration = inMemoryDatabase())), HTMLUNIT) { browser =>
+      val driver = new FirefoxDriver
+      driver.manage().window().maximize()
+      driver.get(baseUrl + "/login")
+      driver.findElementById("email").sendKeys("test")
+      driver.findElementById("password").sendKeys("test")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("menuItem").click
+      driver.findElementById("brandForm").click
+      driver.findElementById("name").sendKeys("nokia")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementByCssSelector(".panel-title").getText.contains("Brand successfully added")
+      driver.findElementById("menuItem").click
+      driver.findElementById("createMobileModel").click
+      new Select(driver.findElementById("brandName")).selectByVisibleText("nokia")
+      driver.findElementById("modelName").sendKeys("Asha 200")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementByCssSelector("BODY").getText().contains("Mobile Model successfully added")
+
+    }
+  }
+}
diff --git a/test/automation/ProofDemandingFromUserTest.scala b/test/automation/ProofDemandingFromUserTest.scala
new file mode 100644
index 0000000..2e80dee
--- /dev/null
+++ b/test/automation/ProofDemandingFromUserTest.scala
@@ -0,0 +1,61 @@
+package automation
+
+import scala.slick.driver.PostgresDriver.simple._
+import org.specs2.mutable.Specification
+import play.api.test.WithServer
+import play.api.libs.ws.WS
+import play.api.test.Helpers._
+import play.api.test.Helpers.await
+import play.api.test.TestServer
+import play.api.test.WithServer
+import utils.Connection
+import java.util.concurrent.TimeUnit
+import org.openqa.selenium.support.ui.Select
+import play.api.test.FakeApplication
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.By
+import org.openqa.selenium.WebElement
+
+class ProofDemandingFromUserTest extends Specification {
+  val port = 19001
+  val baseUrl = "http://localhost:19001"
+
+  "Proof Demanding a Mobile User" in {
+    running(TestServer(port, FakeApplication(additionalConfiguration = inMemoryDatabase())), HTMLUNIT) { browser =>
+      val driver = new FirefoxDriver
+      driver.manage().window().maximize()
+      driver.get(baseUrl + "/login")
+      driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS)
+      driver.findElementById("email").sendKeys("test")
+      driver.findElementById("password").sendKeys("test")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("menuItem").click
+      driver.findElementById("brandForm").click
+      driver.findElementById("name").sendKeys("nokia")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementByCssSelector(".panel-title").getText.contains("Brand successfully added")
+      driver.findElementById("menuItem").click
+      driver.findElementById("createMobileModel").click
+      new Select(driver.findElementById("brandName")).selectByVisibleText("nokia")
+      driver.findElementById("modelName").sendKeys("Asha 200")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("stolenPhone").click
+      driver.findElementById("userName").sendKeys("manish")
+      new Select(driver.findElementById("brandId")).selectByVisibleText("nokia")
+      new Select(driver.findElementById("mobileModelId")).selectByVisibleText("Asha 200")
+      driver.findElementById("email").sendKeys("reseamanish@gmail.com")
+      driver.findElementById("imeiMeid").sendKeys("123456789012347")
+      driver.executeScript("""document.getElementById("purchaseDate").value="03/03/2014";""")
+      driver.findElementById("contactNo").sendKeys("+91 1234567890")
+      driver.findElementById("description").sendKeys("selenium test desc")
+      driver.findElementById("fileUpload").sendKeys("/home/knoldus/Pictures/selenium.png")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS)
+      driver.findElementById("menuItem").click
+      driver.findElementById("listOfRequest").click
+      driver.findElementById("demandProof").click
+      driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS)
+      driver.findElementByCssSelector("BODY").getText().contains("A Proof has been demanded from this user!")
+    }
+  }
+}
diff --git a/test/automation/SecureMobileRegistrationTest.scala b/test/automation/SecureMobileRegistrationTest.scala
new file mode 100644
index 0000000..c671bf5
--- /dev/null
+++ b/test/automation/SecureMobileRegistrationTest.scala
@@ -0,0 +1,58 @@
+package automation
+
+import scala.slick.driver.PostgresDriver.simple._
+import org.specs2.mutable.Specification
+import play.api.test.WithServer
+import play.api.libs.ws.WS
+import play.api.test.Helpers._
+import play.api.test.Helpers.await
+import play.api.test.TestServer
+import play.api.test.WithServer
+import utils.Connection
+import java.util.concurrent.TimeUnit
+import org.openqa.selenium.support.ui.Select
+import play.api.test.FakeApplication
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.By
+import org.openqa.selenium.WebElement
+
+class SecureMobileRegistrationTest extends Specification {
+  val port = 19001
+  val baseUrl = "http://localhost:19001"
+
+  "Testing Secure Registration" in {
+    running(TestServer(port, FakeApplication(additionalConfiguration = inMemoryDatabase())), HTMLUNIT) { browser =>
+      val driver = new FirefoxDriver
+      driver.manage().window().maximize()
+      driver.get(baseUrl + "/login")
+      driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS)
+      driver.findElementById("email").sendKeys("test")
+      driver.findElementById("password").sendKeys("test")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("menuItem").click
+      driver.findElementById("brandForm").click
+      driver.findElementById("name").sendKeys("nokia")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementByCssSelector(".panel-title").getText.contains("Brand successfully added")
+      driver.findElementById("menuItem").click
+      driver.findElementById("createMobileModel").click
+      new Select(driver.findElementById("brandName")).selectByVisibleText("nokia")
+      driver.findElementById("modelName").sendKeys("Asha 200")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("securePhone").click
+      driver.findElementById("userName").sendKeys("manish")
+      new Select(driver.findElementById("brandId")).selectByVisibleText("nokia")
+      new Select(driver.findElementById("mobileModelId")).selectByVisibleText("Asha 200")
+      driver.findElementById("email").sendKeys("reseamanish@gmail.com")
+      driver.findElementById("imeiMeid").sendKeys("123456789012347")
+      driver.executeScript("""document.getElementById("purchaseDate").value="03/03/2014";""")
+      driver.findElementById("contactNo").sendKeys("+91 1234567890")
+      driver.findElementById("description").sendKeys("selenium test desc")
+      driver.findElementById("fileUpload").sendKeys("/home/knoldus/Pictures/selenium.png")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.manage().timeouts().implicitlyWait(20, TimeUnit.SECONDS)
+      driver.findElementByCssSelector("BODY").getText().contains("Mobile registered successfully")
+
+    }
+  }
+}
diff --git a/test/automation/StolenMobileRegistrationTest.scala b/test/automation/StolenMobileRegistrationTest.scala
new file mode 100644
index 0000000..e5ca393
--- /dev/null
+++ b/test/automation/StolenMobileRegistrationTest.scala
@@ -0,0 +1,58 @@
+package automation
+
+import scala.slick.driver.PostgresDriver.simple._
+import org.specs2.mutable.Specification
+import play.api.test.WithServer
+import play.api.libs.ws.WS
+import play.api.test.Helpers._
+import play.api.test.Helpers.await
+import play.api.test.TestServer
+import play.api.test.WithServer
+import utils.Connection
+import java.util.concurrent.TimeUnit
+import org.openqa.selenium.support.ui.Select
+import play.api.test.FakeApplication
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.By
+import org.openqa.selenium.WebElement
+
+class StolenMobileRegistrationTest extends Specification {
+  val port = 19001
+  val baseUrl = "http://localhost:19001"
+
+  "Testing Stolen Mobile Registration" in {
+    running(TestServer(port, FakeApplication(additionalConfiguration = inMemoryDatabase())), HTMLUNIT) { browser =>
+      val driver = new FirefoxDriver
+      driver.manage().window().maximize()
+      driver.get(baseUrl + "/login")
+      driver.findElementById("email").sendKeys("test")
+      driver.findElementById("password").sendKeys("test")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("menuItem").click
+      driver.findElementById("brandForm").click
+      driver.findElementById("name").sendKeys("nokia")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementByCssSelector(".panel-title").getText.contains("Brand successfully added")
+      driver.findElementById("menuItem").click
+      driver.findElementById("createMobileModel").click
+      new Select(driver.findElementById("brandName")).selectByVisibleText("nokia")
+      driver.findElementById("modelName").sendKeys("Asha 200")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.findElementById("stolenPhone").click
+      driver.findElementById("userName").sendKeys("manish")
+      new Select(driver.findElementById("brandId")).selectByVisibleText("nokia")
+      new Select(driver.findElementById("mobileModelId")).selectByVisibleText("Asha 200")
+      driver.findElementById("email").sendKeys("reseamanish@gmail.com")
+      driver.findElementById("imeiMeid").sendKeys("123456789012347")
+      driver.executeScript("""document.getElementById("purchaseDate").value="03/03/2014";""")
+      driver.findElementById("contactNo").sendKeys("+91 1234567890")
+      driver.findElementById("description").sendKeys("selenium test desc")
+      driver.findElementById("fileUpload").sendKeys("/home/knoldus/Pictures/selenium.png")
+      driver.findElementByCssSelector(".btn.btn-primary").click
+      driver.manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS)
+      driver.findElementByCssSelector("BODY").getText().contains("Mobile registered successfully")
+
+    }
+  }
+
+}
diff --git a/test/controllers/AdminControllerUnitTest.scala b/test/controllers/AdminControllerUnitTest.scala
new file mode 100644
index 0000000..3b5cc65
--- /dev/null
+++ b/test/controllers/AdminControllerUnitTest.scala
@@ -0,0 +1,227 @@
+package controllers
+
+import org.mockito.Mockito._
+import org.specs2.mock.Mockito
+import org.specs2.mutable._
+import model.repository._
+import play.api.Play.current
+import play.api.cache.Cache
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import play.api.test.FakeRequest
+import play.api.mvc.Security
+import utils._
+import play.api.mvc.Security
+import java.util.{ Date, Calendar }
+import play.api.test.WithApplication
+
+class AdminControllerTestCases extends Specification with Mockito {
+
+  val stolenMobileUser = Mobile(
+    "sushil", 1, 1, "864465028854206", "123456789012677", CommonUtils.getSqlDate(), "+91 9839839830",
+    "gs@gmail.com", "stolen", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "gaurav.png", "nokia", "E5")
+
+  val stolenMobileUser1 = Mobile(
+    "sushil", 1, 1, "864465028854206", "123456789012677", CommonUtils.getSqlDate(), "+91 9839839830",
+    "gs@gmail.com", "Clean", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "gaurav.png", "nokia", "E5")
+
+  val cleanMobileUser = Mobile(
+    "sushil", 1, 1, "12345678901234", "123456789012678", CommonUtils.getSqlDate(), "+91 9839839830",
+    "gs@gmail.com", "Clean", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "gaurav.png", "nokia", "E5")
+
+  val cleanMobileUser1 = Mobile(
+    "sushil", 1, 1, "12345678901234", "123456789012678", CommonUtils.getSqlDate(), "+91 9839839830",
+    "gs@gmail.com", "stolen", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "gaurav.png", "nokia", "E5")
+
+  val mobileWithBrand = (Mobile(
+    "gs", 1, 1, "864465028854206", "123456789012677", CommonUtils.getSqlDate(), "+91 9839839830",
+    "gs@gmail.com", "stolen", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "gaurav.png", "nokia", "E5"), "nokia", "E5")
+
+  val getAllMobilesWithBrand: List[(Mobile, String, String)] = List(mobileWithBrand)
+  val audit = List(Audit("864465028854206", new java.sql.Timestamp(new java.util.Date().getTime), Some(1)))
+  val user = User("admin", "knol2013")
+
+  val mockedMail = mock[MailUtil]
+  val mockedS3Util = mock[S3UtilComponent]
+  val mockedMobilRepo = mock[MobileRepository]
+  val mockedAuditRepo = mock[AuditRepository]
+  val adminController = new AdminController(mockedMobilRepo, mockedAuditRepo, mockedMail, mockedS3Util)
+
+  "AdminControllerTesting: mobiles" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.insertMobileUser(stolenMobileUser)).thenReturn(Right(Some(1)))
+      when(mockedMobilRepo.getAllMobilesUserWithBrandAndModel(StatusUtil.Status.pending.toString())).thenReturn(getAllMobilesWithBrand)
+      val result = adminController.mobiles(StatusUtil.Status.pending.toString())(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "AdminControllerTesting: approve-> of stolen mobile" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToApproveByIMEID("864465028854206")).thenReturn(Right(1))
+      when(mockedMobilRepo.getMobileUserByIMEID("864465028854206")).thenReturn(Some(stolenMobileUser))
+      mockedMail.sendMail(stolenMobileUser.imeiMeid + " <" + stolenMobileUser.email + ">",
+        "Registration Confirmed on MCWS", mockedMail.approvedMessage(stolenMobileUser.imeiMeid))
+      val result = adminController.approve("864465028854206", StatusUtil.Status.approved.toString())(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "AdminControllerTesting: approve-> of clean mobile" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToApproveByIMEID("12345678901234")).thenReturn(Right(1))
+      when(mockedMobilRepo.getMobileUserByIMEID("12345678901234")).thenReturn(Some(cleanMobileUser))
+      mockedMail.sendMail("s@gmail.com", "test", mockedMail.approvedMessage(cleanMobileUser.imeiMeid))
+      val result = adminController.approve("12345678901234", StatusUtil.Status.approved.toString())(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "AdminControllerTesting: approve -> with invalid imeid id" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToApproveByIMEID("12345678901234")).thenReturn(Left("error"))
+      val result = adminController.approve("12345678901234", StatusUtil.Status.approved.toString())(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "AdminControllerTesting: approve -> with vaid imeid data but data not find after approved" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToApproveByIMEID("12345678901234")).thenReturn(Right(1))
+      when(mockedMobilRepo.getMobileUserByIMEID("12345678901234")).thenReturn(None)
+      val result = adminController.approve("12345678901234", StatusUtil.Status.approved.toString())(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "AdminControllerTesting: proofDemanded" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToDemandProofByIMEID("864465028854206")).thenReturn(Right(1))
+      when(mockedMobilRepo.getMobileUserByIMEID("864465028854206")).thenReturn(Some(stolenMobileUser))
+      mockedMail.sendMail(stolenMobileUser.imeiMeid + " <" + stolenMobileUser.email + ">",
+        "Registration Confirmed on MCWS", mockedMail.demandProofMessage(stolenMobileUser.imeiMeid))
+      val result = adminController.proofDemanded("864465028854206", StatusUtil.Status.approved.toString())(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "AdminControllerTesting: proofDemanded-> with invalid imei id" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToDemandProofByIMEID("864465028854206")).thenReturn(Left("error"))
+      val result = adminController.proofDemanded("864465028854206", StatusUtil.Status.approved.toString())(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "AdminControllerTesting: proofDemanded-> with valid imei id but data not find after proofDemanded" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToDemandProofByIMEID("864465028854206")).thenReturn(Right(1))
+      when(mockedMobilRepo.getMobileUserByIMEID("864465028854206")).thenReturn(None)
+      val result = adminController.proofDemanded("864465028854206", StatusUtil.Status.approved.toString())(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "AdminControllerTesting: pending" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToPendingByIMEID("864465028854206")).thenReturn(Right(1))
+      val result = adminController.pending("864465028854206")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "AdminControllerTesting: pending -> failed" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.changeStatusToPendingByIMEID("864465028854206")).thenReturn(Left("error"))
+      val result = adminController.pending("864465028854206")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "AdminControllerTesting: changeMobileRegTypeForm" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      val result = adminController.changeMobileRegTypeForm(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "AdminControllerTesting: changeMobileRegType of stolen mobile" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.getMobileUserByIMEID("864465028854206")).thenReturn(Some(stolenMobileUser))
+      when(mockedMobilRepo.changeRegTypeByIMEID(stolenMobileUser1)).thenReturn(Right(1))
+      val result = adminController.changeMobileRegType("864465028854206")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "AdminControllerTesting: changeMobileRegType of clean mobile" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.getMobileUserByIMEID("12345678901234")).thenReturn(Some(cleanMobileUser))
+      when(mockedMobilRepo.changeRegTypeByIMEID(cleanMobileUser1)).thenReturn(Right(1))
+      val result = adminController.changeMobileRegType("12345678901234")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "AdminControllerTesting: changeMobileRegType -> with invalid mobile data" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.getMobileUserByIMEID("864465028854206")).thenReturn(Some(stolenMobileUser))
+      when(mockedMobilRepo.changeRegTypeByIMEID(stolenMobileUser1)).thenReturn(Left("error"))
+      val result = adminController.changeMobileRegType("864465028854206")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "AdminControllerTesting: deleteMobile" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.getMobileUserByIMEID("864465028854206")).thenReturn(Some(stolenMobileUser))
+      when(mockedMobilRepo.deleteMobileUser("864465028854206")).thenReturn(Right(1))
+      val result = adminController.deleteMobile("864465028854206")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "AdminControllerTesting: deleteMobile -> of invalid record" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.getMobileUserByIMEID("864465028854207")).thenReturn(None)
+      val result = adminController.deleteMobile("864465028854207")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "AdminControllerTesting: deleteMobile -> error in delete record" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedMobilRepo.getMobileUserByIMEID("864465028854206")).thenReturn(Some(stolenMobileUser))
+      when(mockedMobilRepo.deleteMobileUser("864465028854206")).thenReturn(Left("error"))
+      val result = adminController.deleteMobile("864465028854206")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+}
diff --git a/test/controllers/ApplicationUnitTest.scala b/test/controllers/ApplicationUnitTest.scala
new file mode 100644
index 0000000..c090169
--- /dev/null
+++ b/test/controllers/ApplicationUnitTest.scala
@@ -0,0 +1,30 @@
+package controllers
+
+import org.specs2.mock.Mockito
+import org.specs2.mutable.Specification
+import play.api.test
+import play.api.test.FakeApplication
+import play.api.test.FakeRequest
+import play.api.test.Helpers._
+import model.repository.User
+//import com.amazonaws.services.identitymanagement.model.User
+
+class ApplicationTestCases extends Specification with Mockito {
+  
+  "ApplicationController: index" in {
+    running(FakeApplication()) {
+      val user = User("test@gmail.com", "testpass")
+      val result = Application.index(FakeRequest())
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "ApplicationController: javascriptRoutes" in {
+    running(FakeApplication()) {
+      val result = Application.javascriptRoutes(FakeRequest())
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/javascript")
+    }
+  }
+}
diff --git a/test/controllers/AuditControllerUnitTest.scala b/test/controllers/AuditControllerUnitTest.scala
new file mode 100644
index 0000000..618cfe8
--- /dev/null
+++ b/test/controllers/AuditControllerUnitTest.scala
@@ -0,0 +1,74 @@
+package controllers
+
+import org.mockito.Mockito._
+import org.specs2.mock.Mockito
+import org.specs2.mutable._
+import model.repository._
+import play.api.Play.current
+import play.api.cache.Cache
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import play.api.test.FakeRequest
+import play.api.mvc.Security
+import utils._
+import play.api.mvc.Security
+import java.util.Date
+import java.util.Calendar
+import java.sql.Timestamp
+
+class AuditControllerTestCases extends Specification with Mockito {
+
+  val timestamp = Audit("864465028854206", new Timestamp(new java.util.Date().getTime))
+  val auditList=List(Audit("864465028854206", new Timestamp(new java.util.Date().getTime),Some(1)))
+  val mobileUser = Mobile(
+    "sushil", 1, 1, "864465028854206", "123456789012677", CommonUtils.getSqlDate(), "+91 9839839830",
+    "gs@gmail.com", "stolen", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "gaurav.png", "nokia", "E5")
+  val user = User("admin", "knol2013")
+  val mockedAudit = mock[AuditRepository]
+
+  val auditController = new AuditController(mockedAudit)
+
+  "AuditControllerTesting: auditPage" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      val result = auditController.auditPage(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+    }
+  }
+  
+  "AuditControllerTesting: timestampsByIMEI-> with valid form data" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedAudit.getAllTimestampsByIMEID("864465028854206")).thenReturn(auditList)
+      val result = auditController.timestampsByIMEI(FakeRequest().withFormUrlEncodedBody("imeiMeid"->"864465028854206").withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+    }
+  }
+  
+  "AuditControllerTesting: timestampsByIMEI-> with invalid form data" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      val result = auditController.timestampsByIMEI(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+    }
+  }
+  
+  "AuditControllerTesting: allTimestamps" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedAudit.getAllTimestamps).thenReturn(auditList)
+      val result = auditController.allTimestamps(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+    }
+  }
+  
+  "AuditControllerTesting: registrationRecordsByYear" in {
+    running(FakeApplication()) {
+      Cache.set("admin", user)
+      when(mockedAudit.insertMobileUser(mobileUser)).thenReturn(Right(Some(1)))
+      when(mockedAudit.getRecordByDate("2015")).thenReturn(List(1))
+      val result = auditController.registrationRecordsByYear("2015")(FakeRequest().withSession(Security.username -> "admin"))
+      status(result) must equalTo(200)
+    }
+  }
+}
diff --git a/test/controllers/AuthControllerUnitTest.scala b/test/controllers/AuthControllerUnitTest.scala
new file mode 100644
index 0000000..f600b09
--- /dev/null
+++ b/test/controllers/AuthControllerUnitTest.scala
@@ -0,0 +1,37 @@
+package controllers
+
+import org.specs2.mock.Mockito
+import org.specs2.mutable.Specification
+import play.api.test.FakeApplication
+import play.api.test.FakeRequest
+import play.api.test.Helpers.OK
+import play.api.test.Helpers.contentType
+import play.api.test.Helpers.defaultAwaitTimeout
+import play.api.test.Helpers.running
+import play.api.test.Helpers.status
+import model.repository.MobileRepository
+
+class AuthControllerTestCases extends Specification with Mockito {
+  val authController = new AuthController
+
+  "login" in {
+    val result = authController.login(FakeRequest())
+    status(result) must equalTo(OK)
+    contentType(result) must beSome("text/html")
+  }
+
+  "authenticate" in {
+    running(FakeApplication()) {
+      val result = authController.authenticate(FakeRequest())
+      status(result) must equalTo(400)
+      contentType(result) must beSome("text/html") 
+    }
+  }
+
+  "logout" in {
+    running(FakeApplication()) {
+      val result = authController.logout(FakeRequest())
+      status(result) must equalTo(303)
+    }
+  }
+}
diff --git a/test/controllers/MobileControllerUnitTest.scala b/test/controllers/MobileControllerUnitTest.scala
new file mode 100644
index 0000000..767e310
--- /dev/null
+++ b/test/controllers/MobileControllerUnitTest.scala
@@ -0,0 +1,353 @@
+package controllers
+
+import java.sql.Timestamp
+
+import org.mockito.Mockito._
+import org.specs2.mock.Mockito
+import org.specs2.mutable._
+
+import model.repository._
+import play.api.Play.current
+import play.api.cache.Cache
+import play.api.libs.Files
+import play.api.libs.Files.TemporaryFile
+import play.api.mvc.MultipartFormData
+import play.api.mvc.MultipartFormData.BadPart
+import play.api.mvc.MultipartFormData.FilePart
+import play.api.mvc.MultipartFormData.MissingFilePart
+import play.api.mvc.Security
+import play.api.test.FakeApplication
+import play.api.test.FakeHeaders
+import play.api.test.FakeRequest
+import play.api.test.Helpers._
+import utils._
+
+class MobileControllerTestCases extends Specification with Mockito {
+
+  val date = new java.sql.Date(new java.util.Date().getTime())
+  val newbrand = Brand("nokia", Some(1))
+  val brand = List(newbrand)
+  val brandById: Option[Brand] = Some(newbrand)
+  val newmodel = Model("N72", 1)
+  val model = List(newmodel)
+  val modelById: Option[Model] = Some(newmodel)
+  val utildate=CommonUtils.getSqlDate()
+  val user = User("admin", "knol2013")
+  val username = "admin"
+
+  val mobileUser = Mobile(
+    "sushil", 1, 1, "864465028854206", "864465028854206", CommonUtils.getSqlDate(), "+91 8375919908",
+    "sushil@gmail.com", "stolen", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "ss.png", "nokia", "E5")
+
+  val timestamp = new Audit("864465028854206", new Timestamp(new java.util.Date().getTime), Some(1))
+
+  val mockedMail = mock[MailUtil]
+  val mockedCommonUtil=mock[CommonUtils]
+  val s3util = mock[S3UtilComponent]
+  val mockedMobileRepo = mock[MobileRepository]
+  val mockedBrandRepo = mock[BrandRepository]
+  val mockedModelRepo = mock[ModelRepository]
+  val mockedAuditRepo = mock[AuditRepository]
+  val mobileController = new MobileController(mockedMobileRepo, mockedBrandRepo, mockedModelRepo, mockedAuditRepo, mockedMail, s3util,mockedCommonUtil)
+
+  "MobileControllerTesting: mobileRegistrationForm" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      val result = mobileController.mobileRegistrationForm(FakeRequest())
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "MobileControllerTesting: mobileRegistrationSecureForm" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      val result = mobileController.mobileRegistrationSecureForm(FakeRequest())
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "MobileControllerTesting: brandRegisterForm" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val result = mobileController.brandRegisterForm(FakeRequest().withSession(Security.username -> username))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "MobileControllerTesting: modelRegistrationForm" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      val result = mobileController.modelRegistrationForm(FakeRequest().withSession(Security.username -> username))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "MobileControllerTesting: mobileRegistration: with valid data" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val files = Seq[FilePart[TemporaryFile]](FilePart("file", "sushil.jpg", None, TemporaryFile("file", "spec")))
+      val validFormData = Map("userName" -> Seq("manish"),
+        "brandId" -> Seq("1"),
+        "mobileModelId" -> Seq("1"),
+        "imeiMeid" -> Seq("123456789012347"),
+        "otherImeiMeid" -> Seq("1234"),
+        "purchaseDate" -> Seq("2015-03-31"),
+        "contactNo" -> Seq("9958324567"),
+        "email" -> Seq("reseamanish@gmail.com"),
+        "regType" -> Seq("pending"),
+        "document" -> Seq("sushil.jpg"),
+        "description" -> Seq("test"),
+        "otherMobileBrand" -> Seq("nodata "),
+        "otherMobileModel" -> Seq("nodata"))
+      val multipartBody = MultipartFormData(validFormData, files, Seq[BadPart](), Seq[MissingFilePart]())
+      val fakeRequest = FakeRequest[MultipartFormData[Files.TemporaryFile]]("POST", "/mobileRegistration", FakeHeaders(), multipartBody)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      when(mockedCommonUtil.getSqlDate())thenReturn(utildate)
+      when(mockedMobileRepo.insertMobileUser(any[Mobile])).thenReturn(Right(Some(1)))
+      when(mockedMobileRepo.getMobileUserByIMEID("123456789012347")).thenReturn(Some(mobileUser))
+      val result = mobileController.mobileRegistration.apply(fakeRequest.withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+  
+  "MobileControllerTesting: mobileRegistration: with valid data" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val files = Seq[FilePart[TemporaryFile]](FilePart("file", "sushil.jpg", None, TemporaryFile("file", "spec")))
+      val validFormData = Map("userName" -> Seq("manish"),
+        "brandId" -> Seq("1"),
+        "mobileModelId" -> Seq("1"),
+        "imeiMeid" -> Seq("123456789012347"),
+        "otherImeiMeid" -> Seq("1234"),
+        "purchaseDate" -> Seq("2015-03-31"),
+        "contactNo" -> Seq("9958324567"),
+        "email" -> Seq("reseamanish@gmail.com"),
+        "regType" -> Seq("pending"),
+        "document" -> Seq("sushil.jpg"),
+        "description" -> Seq("test"),
+        "otherMobileBrand" -> Seq("nodata "),
+        "otherMobileModel" -> Seq("nodata"))
+      val multipartBody = MultipartFormData(validFormData, files, Seq[BadPart](), Seq[MissingFilePart]())
+      val fakeRequest = FakeRequest[MultipartFormData[Files.TemporaryFile]]("POST", "/mobileRegistration", FakeHeaders(), multipartBody)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      when(mockedCommonUtil.getSqlDate())thenReturn(utildate)
+      when(mockedMobileRepo.insertMobileUser(any[Mobile])).thenReturn(Right(Some(1)))
+      when(mockedMobileRepo.getMobileUserByIMEID("123456789012347")).thenReturn(Some(mobileUser))
+      val result = mobileController.mobileRegistration.apply(fakeRequest.withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+  
+   "MobileControllerTesting: mobileRegistration: error in registration" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val files = Seq[FilePart[TemporaryFile]](FilePart("file", "sushil.jpg", None, TemporaryFile("file", "spec")))
+      val validFormData = Map("userName" -> Seq("manish"),
+        "brandId" -> Seq("1"),
+        "mobileModelId" -> Seq("1"),
+        "imeiMeid" -> Seq("123456789012347"),
+        "otherImeiMeid" -> Seq("1234"),
+        "purchaseDate" -> Seq("2015-03-31"),
+        "contactNo" -> Seq("9958324567"),
+        "email" -> Seq("reseamanish@gmail.com"),
+        "regType" -> Seq("pending"),
+        "document" -> Seq("sushil.jpg"),
+        "description" -> Seq("test"),
+        "otherMobileBrand" -> Seq("nodata "),
+        "otherMobileModel" -> Seq("nodata"))
+      val multipartBody = MultipartFormData(validFormData, files, Seq[BadPart](), Seq[MissingFilePart]())
+      val fakeRequest = FakeRequest[MultipartFormData[Files.TemporaryFile]]("POST", "/mobileRegistration", FakeHeaders(), multipartBody)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      when(mockedCommonUtil.getSqlDate())thenReturn(utildate)
+      when(mockedMobileRepo.insertMobileUser(any[Mobile])).thenReturn(Left("error"))
+      when(mockedMobileRepo.getMobileUserByIMEID("123456789012347")).thenReturn(Some(mobileUser))
+      val result = mobileController.mobileRegistration.apply(fakeRequest.withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "MobileControllerTesting: mobileRegistration: with bad data" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val files = Seq[FilePart[TemporaryFile]](FilePart("file", "sushil.jpg", None, TemporaryFile("file", "spec")))
+      val multipartBody = MultipartFormData(Map[String, Seq[String]](), files, Seq[BadPart](), Seq[MissingFilePart]())
+      val fakeRequest = FakeRequest[MultipartFormData[Files.TemporaryFile]]("POST", "/mobileRegistration", FakeHeaders(), multipartBody)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      when(mockedMobileRepo.insertMobileUser(any[Mobile])).thenReturn(Right(Some(1)))
+      val result = mobileController.mobileRegistration.apply(fakeRequest.withSession(Security.username -> username))
+      status(result) must equalTo(400)
+    }
+  }
+
+  "MobileControllerTesting: checkMobileStatus" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedMobileRepo.getMobileUserByIMEID("864465028854206")).thenReturn(Some(mobileUser))
+      when(mockedBrandRepo.getBrandById(mobileUser.brandId)) thenReturn (brandById)
+      when(mockedModelRepo.getModelById(mobileUser.mobileModelId)).thenReturn(modelById)
+     val result = mobileController.checkMobileStatus("864465028854206","user")(FakeRequest().withSession(Security.username -> username))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("application/json")
+    }
+  }
+
+  "MobileControllerTesting: checkMobileStatus: failed" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedMobileRepo.getMobileUserByIMEID("864465028854206")).thenReturn(None)
+      when(mockedBrandRepo.getBrandById(mobileUser.brandId)) thenReturn (brandById)
+      when(mockedModelRepo.getModelById(mobileUser.mobileModelId)).thenReturn(modelById)
+      when(mockedAuditRepo.insertTimestamp(timestamp)) thenReturn (Right(Some(1)))
+      val result = mobileController.checkMobileStatus("864465028854206","user")(FakeRequest().withSession(Security.username -> username))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("application/json")
+    }
+  }
+
+  "MobileControllerTesting: getModels" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedModelRepo.getAllModelByBrandId(1)) thenReturn (model)
+      val result = mobileController.getModels(1)(FakeRequest())
+      status(result) must equalTo(200)
+      contentType(result) must beSome("application/json")
+    }
+  }
+
+  "MobileControllerTesting: mobileStatus" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val result = mobileController.mobileStatus(FakeRequest())
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "MobileControllerTesting: isImeiExist -> existed imeid" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedMobileRepo.getMobileUserByIMEID("864465028854206")) thenReturn (Some(mobileUser))
+      val result = mobileController.isImeiExist("864465028854206")(FakeRequest())
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "MobileControllerTesting: isImeiExist -> nonexist imeid" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedMobileRepo.getMobileUserByIMEID("864465029854205")) thenReturn (None)
+      val result = mobileController.isImeiExist("864465029854205")(FakeRequest())
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "MobileControllerTesting: isImeiExist -> valid imeid" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      mockedCommonUtil.validateImei("864465028854206")
+      val result = mobileController.isImeiExist("864465028854206")(FakeRequest())
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+  
+  "MobileControllerTesting: isImeiExist -> invalid imeid" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      mockedCommonUtil.validateImei("864465028854201")
+      val result = mobileController.isImeiExist("864465028854201")(FakeRequest())
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/plain")
+    }
+  }
+
+  "MobileControllerTesting: saveBrand -> with invalid form data" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val result = mobileController.saveBrand(FakeRequest().withSession(Security.username -> username))
+      status(result) must equalTo(400)
+    }
+  }
+
+  "MobileControllerTesting: saveBrand -> with valid form data and brand not exist" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn(List(Brand("sony")))
+      when(mockedBrandRepo.insertBrand(any[Brand])) thenReturn (Right(Some(1)))
+      val result = mobileController.saveBrand(FakeRequest().withFormUrlEncodedBody("name" -> "nokia").withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+  
+  "MobileControllerTesting: saveBrand -> brand already exist" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn(List(Brand("nokia")))
+      val result = mobileController.saveBrand(FakeRequest().withFormUrlEncodedBody("name" -> "nokia").withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "MobileControllerTesting: saveBrand -> error in insert brand" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn(List(Brand("sony")))
+      when(mockedBrandRepo.insertBrand(any[Brand])) thenReturn (Left("error"))
+      val result = mobileController.saveBrand(FakeRequest().withFormUrlEncodedBody("name" -> "nokia").withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "MobileControllerTesting: saveModel-> with invalid form data" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+       when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      when(mockedModelRepo.getAllModelByBrandId(1)) thenReturn(List(Model("N73",1)))
+      when(mockedModelRepo.insertModel(any[Model])) thenReturn (Right(Some(1)))
+      val result = mobileController.saveModel(FakeRequest().withSession(Security.username -> username))
+      status(result) must equalTo(400)
+    }
+  }
+
+  "MobileControllerTesting: saveModel-> with valid form data" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      when(mockedModelRepo.getAllModelByBrandId(1)) thenReturn(List(Model("N73",1)))
+      when(mockedModelRepo.insertModel(any[Model])) thenReturn (Right(Some(1)))
+      val result = mobileController.saveModel(FakeRequest().withFormUrlEncodedBody("brandName" -> "1", "modelName" -> "N72").withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+  
+  "MobileControllerTesting: saveModel-> model already exist" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      when(mockedModelRepo.getAllModelByBrandId(1)) thenReturn(List(Model("N72",1)))
+      val result = mobileController.saveModel(FakeRequest().withFormUrlEncodedBody("brandName" -> "1", "modelName" -> "N72").withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+
+  "MobileControllerTesting: saveModel-> error in inserting model" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      when(mockedBrandRepo.getAllBrands) thenReturn (brand)
+      when(mockedModelRepo.getAllModelByBrandId(1)) thenReturn(List(Model("N72",1)))
+      when(mockedModelRepo.insertModel(any[Model])) thenReturn (Left("error"))
+      val result = mobileController.saveModel(FakeRequest().withFormUrlEncodedBody("brandName" -> "1", "modelName" -> "E5").withSession(Security.username -> username))
+      status(result) must equalTo(303)
+    }
+  }
+
+}
diff --git a/test/controllers/ResourcesUnitTest.scala b/test/controllers/ResourcesUnitTest.scala
new file mode 100644
index 0000000..2c960d7
--- /dev/null
+++ b/test/controllers/ResourcesUnitTest.scala
@@ -0,0 +1,54 @@
+package controllers
+
+import org.mockito.Mockito._
+import org.scalatest.BeforeAndAfter
+import org.specs2.mock.Mockito
+import org.specs2.mutable._
+import play.api.Play.current
+import play.api.cache.Cache
+import play.api.test.Helpers._
+import play.api.test.FakeApplication
+import play.api.test.FakeRequest
+import model.repository.User
+
+class ResourcesTestCases extends Specification with Mockito {
+
+  val username = "admin"
+  val user = User("admin", "knol2013")
+
+  "ResourcesTesting: contactUs" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val result = Resources.contactUs(FakeRequest())
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  "ResourcesTesting: blog" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val result = Resources.blog(FakeRequest())
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+  
+  "ResourcesTesting: FAQs" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val result = Resources.faq(FakeRequest())
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+  
+  "ResourcesTesting: discussionforum" in {
+    running(FakeApplication()) {
+      Cache.set(username, user)
+      val result = Resources.discussionforum(FakeRequest())
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+    }
+  }
+}
diff --git a/test/model/repository/AuditRepoTest.scala b/test/model/repository/AuditRepoTest.scala
new file mode 100644
index 0000000..9cf1171
--- /dev/null
+++ b/test/model/repository/AuditRepoTest.scala
@@ -0,0 +1,65 @@
+package model.repository
+
+import org.scalatest.FunSuite
+import model.repository._
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import utils._
+import model.repository.AuditRepository.audits
+import scala.slick.driver.PostgresDriver.simple._
+
+class AuditRepoTest extends FunSuite {
+  val timeStamp = new java.sql.Timestamp(new java.util.Date().getTime)
+
+  val auditTimestamp = Audit("123456789012345", timeStamp, Some(1))
+  
+   val mobileUser = Mobile(
+    "sushil", 1, 1, "123456789012345", "123456789012677", CommonUtils.getSqlDate(), "+91 9839839830",
+    "gs@gmail.com", "stolen", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "gaurav.png", "nokia", "E5")
+
+  //Tests insertion of a timeStamp
+  test("AuditRepository: insertTimestamp ") {
+    running(FakeApplication()) {
+      val returnedValue = AuditRepository.insertTimestamp(auditTimestamp)
+      assert(returnedValue === Right(Some(1)))
+    }
+  }
+  
+  test("AuditRepository: insertTimestamp -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        audits.ddl.drop
+      }
+      val returnValueOnChange = AuditRepository.insertTimestamp(auditTimestamp)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+  
+
+  //Test listing of all TimeStamp with an IMEID
+  test("AuditRepository: getAllTimestampsByIMEID") {
+    running(FakeApplication()) {
+      val imeiInserted = "123456789012345"
+      AuditRepository.insertTimestamp(auditTimestamp)
+      val returnedValue = AuditRepository.getAllTimestampsByIMEID(imeiInserted)
+      assert(returnedValue === List(auditTimestamp))
+    }
+  }
+
+  //Test listing of all TimeStamps
+  test("AuditRepository: getAllTimestamps") {
+    running(FakeApplication()) {
+      AuditRepository.insertTimestamp(auditTimestamp)
+      val returnedValue = AuditRepository.getAllTimestamps
+      assert(returnedValue === List(auditTimestamp))
+    }
+  }
+
+  test("AuditRepository: getRecordByDate") {
+    running(FakeApplication()) {
+      MobileRepository.insertMobileUser(mobileUser)
+      val returnedValue = AuditRepository.getRecordByDate("2015")
+      assert(returnedValue === List(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+    }
+  }
+}
diff --git a/test/model/repository/AuditRepoUnitTest.scala b/test/model/repository/AuditRepoUnitTest.scala
new file mode 100644
index 0000000..9cf1171
--- /dev/null
+++ b/test/model/repository/AuditRepoUnitTest.scala
@@ -0,0 +1,65 @@
+package model.repository
+
+import org.scalatest.FunSuite
+import model.repository._
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import utils._
+import model.repository.AuditRepository.audits
+import scala.slick.driver.PostgresDriver.simple._
+
+class AuditRepoTest extends FunSuite {
+  val timeStamp = new java.sql.Timestamp(new java.util.Date().getTime)
+
+  val auditTimestamp = Audit("123456789012345", timeStamp, Some(1))
+  
+   val mobileUser = Mobile(
+    "sushil", 1, 1, "123456789012345", "123456789012677", CommonUtils.getSqlDate(), "+91 9839839830",
+    "gs@gmail.com", "stolen", StatusUtil.Status.pending, "test", CommonUtils.getSqlDate(), "gaurav.png", "nokia", "E5")
+
+  //Tests insertion of a timeStamp
+  test("AuditRepository: insertTimestamp ") {
+    running(FakeApplication()) {
+      val returnedValue = AuditRepository.insertTimestamp(auditTimestamp)
+      assert(returnedValue === Right(Some(1)))
+    }
+  }
+  
+  test("AuditRepository: insertTimestamp -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        audits.ddl.drop
+      }
+      val returnValueOnChange = AuditRepository.insertTimestamp(auditTimestamp)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+  
+
+  //Test listing of all TimeStamp with an IMEID
+  test("AuditRepository: getAllTimestampsByIMEID") {
+    running(FakeApplication()) {
+      val imeiInserted = "123456789012345"
+      AuditRepository.insertTimestamp(auditTimestamp)
+      val returnedValue = AuditRepository.getAllTimestampsByIMEID(imeiInserted)
+      assert(returnedValue === List(auditTimestamp))
+    }
+  }
+
+  //Test listing of all TimeStamps
+  test("AuditRepository: getAllTimestamps") {
+    running(FakeApplication()) {
+      AuditRepository.insertTimestamp(auditTimestamp)
+      val returnedValue = AuditRepository.getAllTimestamps
+      assert(returnedValue === List(auditTimestamp))
+    }
+  }
+
+  test("AuditRepository: getRecordByDate") {
+    running(FakeApplication()) {
+      MobileRepository.insertMobileUser(mobileUser)
+      val returnedValue = AuditRepository.getRecordByDate("2015")
+      assert(returnedValue === List(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+    }
+  }
+}
diff --git a/test/model/repository/BrandRepoTest.scala b/test/model/repository/BrandRepoTest.scala
new file mode 100644
index 0000000..4699135
--- /dev/null
+++ b/test/model/repository/BrandRepoTest.scala
@@ -0,0 +1,63 @@
+package model.repository
+
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import utils.Connection
+import org.scalatest.FunSuite
+import org.scalatest.BeforeAndAfterEach
+import model.repository.Brand
+import model.repository.{ BrandRepository, MobileRepository, ModelRepository }
+import model._
+import java.util.Date
+import org.scalatest.BeforeAndAfterAll
+
+class BrandRepoTest extends FunSuite  {
+
+  val brand = Brand("nokia",Some(1))
+
+  //Tests Brand Insertion
+  test("BrandRepository: insert a brand successfully") {
+    running(FakeApplication()) {
+      val valueToCompare = Right(Some(1))
+      val valueReturned = BrandRepository.insertBrand(brand)
+      assert(valueToCompare === valueReturned)
+    }
+  }
+
+  //Tests duplicate brand insertion
+
+  test("BrandRepository: insert a duplicate brand : unsuccessfull") {
+    running(FakeApplication()) {
+      //insert first brand
+      BrandRepository.insertBrand(brand)
+      //insert it again and get the result
+      val valueReturned = BrandRepository.insertBrand(brand)
+      assert(valueReturned.isLeft)
+    }
+  }
+
+  //Tests the listing of the inserted Brand
+
+  test("BrandRepository: Lists inserted brands") {
+    running(FakeApplication()) {
+      //insert first brand
+      BrandRepository.insertBrand(brand)
+      val valueToCompare = List(brand)
+      val valueReturned = BrandRepository.getAllBrands
+      assert(valueToCompare === valueReturned)
+    }
+  }
+  //Tests fetching a brand by its id 
+  test("BrandRepository: fetch brand by id") {
+    running(FakeApplication()) {
+   //insert first brand
+      BrandRepository.insertBrand(brand)
+      val insertedBrandId = 1
+      val valueToCompare = Some(brand)
+      val valueReturned = BrandRepository.getBrandById(insertedBrandId)
+      assert(valueToCompare === valueReturned)
+    }
+  }
+
+}
+
diff --git a/test/model/repository/BrandRepoUnitTest.scala b/test/model/repository/BrandRepoUnitTest.scala
new file mode 100644
index 0000000..4699135
--- /dev/null
+++ b/test/model/repository/BrandRepoUnitTest.scala
@@ -0,0 +1,63 @@
+package model.repository
+
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import utils.Connection
+import org.scalatest.FunSuite
+import org.scalatest.BeforeAndAfterEach
+import model.repository.Brand
+import model.repository.{ BrandRepository, MobileRepository, ModelRepository }
+import model._
+import java.util.Date
+import org.scalatest.BeforeAndAfterAll
+
+class BrandRepoTest extends FunSuite  {
+
+  val brand = Brand("nokia",Some(1))
+
+  //Tests Brand Insertion
+  test("BrandRepository: insert a brand successfully") {
+    running(FakeApplication()) {
+      val valueToCompare = Right(Some(1))
+      val valueReturned = BrandRepository.insertBrand(brand)
+      assert(valueToCompare === valueReturned)
+    }
+  }
+
+  //Tests duplicate brand insertion
+
+  test("BrandRepository: insert a duplicate brand : unsuccessfull") {
+    running(FakeApplication()) {
+      //insert first brand
+      BrandRepository.insertBrand(brand)
+      //insert it again and get the result
+      val valueReturned = BrandRepository.insertBrand(brand)
+      assert(valueReturned.isLeft)
+    }
+  }
+
+  //Tests the listing of the inserted Brand
+
+  test("BrandRepository: Lists inserted brands") {
+    running(FakeApplication()) {
+      //insert first brand
+      BrandRepository.insertBrand(brand)
+      val valueToCompare = List(brand)
+      val valueReturned = BrandRepository.getAllBrands
+      assert(valueToCompare === valueReturned)
+    }
+  }
+  //Tests fetching a brand by its id 
+  test("BrandRepository: fetch brand by id") {
+    running(FakeApplication()) {
+   //insert first brand
+      BrandRepository.insertBrand(brand)
+      val insertedBrandId = 1
+      val valueToCompare = Some(brand)
+      val valueReturned = BrandRepository.getBrandById(insertedBrandId)
+      assert(valueToCompare === valueReturned)
+    }
+  }
+
+}
+
diff --git a/test/model/repository/MobileRepoTest.scala b/test/model/repository/MobileRepoTest.scala
new file mode 100644
index 0000000..77f2038
--- /dev/null
+++ b/test/model/repository/MobileRepoTest.scala
@@ -0,0 +1,203 @@
+package model.repository
+
+import org.scalatest.FunSuite
+import model.repository.{ Brand, Mobile, Model }
+import model.repository.{ BrandRepository, MobileRepository, ModelRepository }
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import utils.StatusUtil.Status
+import utils.Connection
+import scala.slick.driver.PostgresDriver.simple._
+
+/**
+ * Class MobileRepoTest: Unit tests the methods in MobileRepository.
+ */
+
+class MobileRepoTest extends FunSuite with MobileRepository with BrandRepository with ModelRepository {
+  val imeiInserted = "12345678901234"
+  val brand = Brand("nokia", Some(1))
+  val model = Model("N72", 1)
+  val mobileUser = Mobile(
+    "gauravs", 1, 1, "12345678901234", "12345678902134", new java.sql.Date(121230), "+91 9839839830",
+    "gs@gmail.com", "stolen", Status.pending, "ddas asd", new java.sql.Date(121230), "gaurav.png", "Sigma", "Sigma454", Some(1))
+
+  //Mobile Insertion Test 
+  test("MobileRepository:insert and get mobile name successfully ") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      insertModel(model)
+      val insertedMobile = insertMobileUser(mobileUser)
+      assert(insertedMobile === Right(Some(1)))
+    }
+  }
+
+  //Tests the insertion of a MobileUser with Duplicate Email
+  test("MobileRepository:insert fails since email is duplicate ") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = insertMobileUser(mobileUser)
+      //Insert it again to test duplicate entry 
+      val insertedDuplicateMobile = insertMobileUser(mobileUser)
+      println(insertedDuplicateMobile)
+      assert(insertedDuplicateMobile.isLeft)
+    }
+  }
+
+  //Test the fetching of Mobile Record by an IMEID
+  test("MobileRepository: get Mobile by IMEID ") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      insertModel(model)
+      insertMobileUser(mobileUser)
+      val mobileUserToCompareWith = getMobileUserByIMEID(imeiInserted)
+      assert(mobileUserToCompareWith.isEmpty == false)
+    }
+  }
+
+  //Test the status change from Pending to Approved
+  test("MobileRepository: change status from Pending to Approved and must return Right(1)") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      //Changes its status
+      val returnValueOnChange = MobileRepository.changeStatusToApproveByIMEID(imeiInserted)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+
+  test("MobileRepository:changeStatusToApproveByIMEID -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.changeStatusToApproveByIMEID(imeiInserted)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+
+  //Test the status change of Mobile from pending to DemandProof
+  test("MobileRepository: change of Mobile from pending to DemandProof: must return Right(1)") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      //Changes its status
+      val returnValueOnChange = MobileRepository.changeStatusToDemandProofByIMEID(imeiInserted)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+  
+  test("MobileRepository:changeStatusToDemandProofByIMEID -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.changeStatusToDemandProofByIMEID(imeiInserted)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+
+  //Test the status change of Mobile mobile registration (stolen or clean) 
+  test("MobileRepository: Change registration type (Stolen or Clean): must return Right(1)") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      //Changes its status
+      val returnValueOnChange = MobileRepository.changeRegTypeByIMEID(mobileUser)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+  
+  test("MobileRepository:changeRegTypeByIMEID -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.changeRegTypeByIMEID(mobileUser)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+
+  //Test the Retrieval all mobile user with brand and model based on status 
+  test("MobileRepository: Retrieval all mobile user with brand and model") {
+    running(FakeApplication()) {
+      //insert a brand record
+      BrandRepository.insertBrand(Brand("Sigma", Some(1)))
+      //Insert a Model Record
+      ModelRepository.insertModel((Model("Sigma454", 1)))
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser((mobileUser))
+      //Insert a Brand Record
+      val returnValueOnChange = MobileRepository.getAllMobilesUserWithBrandAndModel("pending")
+      assert(returnValueOnChange.isEmpty == false)
+    }
+  }
+
+  //Test the deletion of mobile user 
+  test("MobileRepository: delete a mobile user record") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      val returnValueOnChange = MobileRepository.deleteMobileUser(imeiInserted)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+  
+  test("MobileRepository:deleteMobileUser -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.deleteMobileUser(imeiInserted)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+
+  //Tests change status to Pending by IMEID
+  test("MobileRepository: change of Mobile status to pending: must return Right(1)") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      //Changes its status
+      val returnValueOnChange = MobileRepository.changeStatusToPendingByIMEID(imeiInserted)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+  
+  test("MobileRepository:changeStatusToPendingByIMEID -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.changeStatusToPendingByIMEID(imeiInserted)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+}
diff --git a/test/model/repository/MobileRepoUnitTest.scala b/test/model/repository/MobileRepoUnitTest.scala
new file mode 100644
index 0000000..77f2038
--- /dev/null
+++ b/test/model/repository/MobileRepoUnitTest.scala
@@ -0,0 +1,203 @@
+package model.repository
+
+import org.scalatest.FunSuite
+import model.repository.{ Brand, Mobile, Model }
+import model.repository.{ BrandRepository, MobileRepository, ModelRepository }
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import utils.StatusUtil.Status
+import utils.Connection
+import scala.slick.driver.PostgresDriver.simple._
+
+/**
+ * Class MobileRepoTest: Unit tests the methods in MobileRepository.
+ */
+
+class MobileRepoTest extends FunSuite with MobileRepository with BrandRepository with ModelRepository {
+  val imeiInserted = "12345678901234"
+  val brand = Brand("nokia", Some(1))
+  val model = Model("N72", 1)
+  val mobileUser = Mobile(
+    "gauravs", 1, 1, "12345678901234", "12345678902134", new java.sql.Date(121230), "+91 9839839830",
+    "gs@gmail.com", "stolen", Status.pending, "ddas asd", new java.sql.Date(121230), "gaurav.png", "Sigma", "Sigma454", Some(1))
+
+  //Mobile Insertion Test 
+  test("MobileRepository:insert and get mobile name successfully ") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      insertModel(model)
+      val insertedMobile = insertMobileUser(mobileUser)
+      assert(insertedMobile === Right(Some(1)))
+    }
+  }
+
+  //Tests the insertion of a MobileUser with Duplicate Email
+  test("MobileRepository:insert fails since email is duplicate ") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = insertMobileUser(mobileUser)
+      //Insert it again to test duplicate entry 
+      val insertedDuplicateMobile = insertMobileUser(mobileUser)
+      println(insertedDuplicateMobile)
+      assert(insertedDuplicateMobile.isLeft)
+    }
+  }
+
+  //Test the fetching of Mobile Record by an IMEID
+  test("MobileRepository: get Mobile by IMEID ") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      insertModel(model)
+      insertMobileUser(mobileUser)
+      val mobileUserToCompareWith = getMobileUserByIMEID(imeiInserted)
+      assert(mobileUserToCompareWith.isEmpty == false)
+    }
+  }
+
+  //Test the status change from Pending to Approved
+  test("MobileRepository: change status from Pending to Approved and must return Right(1)") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      //Changes its status
+      val returnValueOnChange = MobileRepository.changeStatusToApproveByIMEID(imeiInserted)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+
+  test("MobileRepository:changeStatusToApproveByIMEID -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.changeStatusToApproveByIMEID(imeiInserted)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+
+  //Test the status change of Mobile from pending to DemandProof
+  test("MobileRepository: change of Mobile from pending to DemandProof: must return Right(1)") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      //Changes its status
+      val returnValueOnChange = MobileRepository.changeStatusToDemandProofByIMEID(imeiInserted)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+  
+  test("MobileRepository:changeStatusToDemandProofByIMEID -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.changeStatusToDemandProofByIMEID(imeiInserted)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+
+  //Test the status change of Mobile mobile registration (stolen or clean) 
+  test("MobileRepository: Change registration type (Stolen or Clean): must return Right(1)") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      //Changes its status
+      val returnValueOnChange = MobileRepository.changeRegTypeByIMEID(mobileUser)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+  
+  test("MobileRepository:changeRegTypeByIMEID -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.changeRegTypeByIMEID(mobileUser)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+
+  //Test the Retrieval all mobile user with brand and model based on status 
+  test("MobileRepository: Retrieval all mobile user with brand and model") {
+    running(FakeApplication()) {
+      //insert a brand record
+      BrandRepository.insertBrand(Brand("Sigma", Some(1)))
+      //Insert a Model Record
+      ModelRepository.insertModel((Model("Sigma454", 1)))
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser((mobileUser))
+      //Insert a Brand Record
+      val returnValueOnChange = MobileRepository.getAllMobilesUserWithBrandAndModel("pending")
+      assert(returnValueOnChange.isEmpty == false)
+    }
+  }
+
+  //Test the deletion of mobile user 
+  test("MobileRepository: delete a mobile user record") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      val returnValueOnChange = MobileRepository.deleteMobileUser(imeiInserted)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+  
+  test("MobileRepository:deleteMobileUser -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.deleteMobileUser(imeiInserted)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+
+  //Tests change status to Pending by IMEID
+  test("MobileRepository: change of Mobile status to pending: must return Right(1)") {
+    running(FakeApplication()) {
+      //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert a model to avoid FK violation while inserting mobile record
+      ModelRepository.insertModel(model)
+      //Insert a Mobile Record first
+      val insertedMobile = MobileRepository.insertMobileUser(mobileUser)
+      //Changes its status
+      val returnValueOnChange = MobileRepository.changeStatusToPendingByIMEID(imeiInserted)
+      assert(returnValueOnChange === Right(1))
+    }
+  }
+  
+  test("MobileRepository:changeStatusToPendingByIMEID -> failed") {
+    running(FakeApplication()) {
+      Connection.databaseObject().withSession { implicit session: Session =>
+        mobiles.ddl.drop
+      }
+      val returnValueOnChange = MobileRepository.changeStatusToPendingByIMEID(imeiInserted)
+      assert(returnValueOnChange.isLeft)
+    }
+  }
+}
diff --git a/test/model/repository/ModelRepoTest.scala b/test/model/repository/ModelRepoTest.scala
new file mode 100644
index 0000000..d5e4665
--- /dev/null
+++ b/test/model/repository/ModelRepoTest.scala
@@ -0,0 +1,66 @@
+package model.repository
+
+import org.scalatest.FunSuite
+import model.repository.{Brand,Model}
+import model.repository.{ BrandRepository, ModelRepository }
+import play.api.test.Helpers._
+import utils.StatusUtil.Status
+import play.api.test.FakeApplication
+
+class ModelRepoTest extends FunSuite {
+  val brand = Brand("nokia", Some(1))
+  val model = Model("N72", 1, Some(1))
+  
+  //Test model insertion
+  test("ModelRepository :insert a model successfully ") {
+    running(FakeApplication()) {
+     //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      val valueReturned = ModelRepository.insertModel(model)
+      assert(valueReturned === Right(Some(1)))
+    }
+  } 
+  
+  //Tests duplicate model insertion
+  test("ModelRepository :insert a duplicate model") {
+    running(FakeApplication()) {
+     //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert first model
+      ModelRepository.insertModel(model)
+      //insert duplicate model and get the return result
+      val valueReturned = ModelRepository.insertModel(model)
+      assert(valueReturned.isLeft)
+    }
+  }
+  
+  //Tests fetching model by its imeid_number
+  test("ModelRepository :fetch a model by its Id") {
+    running(FakeApplication()) {
+      val insertedModelId = 1
+     //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert first model
+      ModelRepository.insertModel(model)
+      //insert duplicate model and get the return result
+      val valueReturned = ModelRepository.getModelById(insertedModelId)
+      assert(valueReturned === Some(model))
+    }
+  }
+  
+  //Tests fetching list of Models my a brand id
+  
+  test("ModelRepository: fetch the list of models by a brand"){
+    running(FakeApplication()) {
+      val insertedBrandId = 1
+     //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert first model
+      ModelRepository.insertModel(model)
+      //insert duplicate model and get the return result
+      val valueReturned = ModelRepository.getAllModelByBrandId(insertedBrandId)
+      assert(valueReturned === List(model))
+    }
+  }
+}
+
diff --git a/test/model/repository/ModelRepoUnitTest.scala b/test/model/repository/ModelRepoUnitTest.scala
new file mode 100644
index 0000000..d5e4665
--- /dev/null
+++ b/test/model/repository/ModelRepoUnitTest.scala
@@ -0,0 +1,66 @@
+package model.repository
+
+import org.scalatest.FunSuite
+import model.repository.{Brand,Model}
+import model.repository.{ BrandRepository, ModelRepository }
+import play.api.test.Helpers._
+import utils.StatusUtil.Status
+import play.api.test.FakeApplication
+
+class ModelRepoTest extends FunSuite {
+  val brand = Brand("nokia", Some(1))
+  val model = Model("N72", 1, Some(1))
+  
+  //Test model insertion
+  test("ModelRepository :insert a model successfully ") {
+    running(FakeApplication()) {
+     //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      val valueReturned = ModelRepository.insertModel(model)
+      assert(valueReturned === Right(Some(1)))
+    }
+  } 
+  
+  //Tests duplicate model insertion
+  test("ModelRepository :insert a duplicate model") {
+    running(FakeApplication()) {
+     //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert first model
+      ModelRepository.insertModel(model)
+      //insert duplicate model and get the return result
+      val valueReturned = ModelRepository.insertModel(model)
+      assert(valueReturned.isLeft)
+    }
+  }
+  
+  //Tests fetching model by its imeid_number
+  test("ModelRepository :fetch a model by its Id") {
+    running(FakeApplication()) {
+      val insertedModelId = 1
+     //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert first model
+      ModelRepository.insertModel(model)
+      //insert duplicate model and get the return result
+      val valueReturned = ModelRepository.getModelById(insertedModelId)
+      assert(valueReturned === Some(model))
+    }
+  }
+  
+  //Tests fetching list of Models my a brand id
+  
+  test("ModelRepository: fetch the list of models by a brand"){
+    running(FakeApplication()) {
+      val insertedBrandId = 1
+     //Insert a brand to avoid FK violation while inserting mobile record
+      BrandRepository.insertBrand(brand)
+      //Insert first model
+      ModelRepository.insertModel(model)
+      //insert duplicate model and get the return result
+      val valueReturned = ModelRepository.getAllModelByBrandId(insertedBrandId)
+      assert(valueReturned === List(model))
+    }
+  }
+}
+
diff --git a/test/routes/RouterTest.scala b/test/routes/RouterTest.scala
new file mode 100644
index 0000000..174b9ad
--- /dev/null
+++ b/test/routes/RouterTest.scala
@@ -0,0 +1,166 @@
+package routes
+
+import org.specs2.mutable.Specification
+import play.api.test.FakeApplication
+import play.api.test.FakeRequest
+import play.api.test.Helpers._
+import play.api.mvc.Security
+import play.api.cache.Cache
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+import play.api.Play.current
+import model.repository.Brand
+import model.repository.Model
+import model.repository.Mobile
+import utils.StatusUtil.Status
+import model.repository.MobileRepository
+import model.repository.BrandRepository
+import model.repository.ModelRepository
+import model.repository.AuditRepository
+
+class RouterTest extends Specification {
+
+  "respond to the index Action" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/"))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+      charset(result) must beSome("utf-8")
+    }
+  }
+
+  "redirect to contact us" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/contact-us"))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+      charset(result) must beSome("utf-8")
+    }
+  }
+
+  "redirect to blog" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/blog"))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+      charset(result) must beSome("utf-8")
+    }
+  }
+
+  "redirect to FAQs" in {
+
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/faq"))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+      charset(result) must beSome("utf-8")
+    }
+  }
+
+  "redirect to discussion forum" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/discussionforum"))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+      charset(result) must beSome("utf-8")
+    }
+  }
+
+  "submit mobile registration " in {
+    running(FakeApplication()) {
+      val result = route(FakeRequest(POST, "/mobileRegistration").withFormUrlEncodedBody(
+        "userName" -> "sushil",
+        "brandId" -> "1",
+        "mobileModelId" -> "1",
+        "imeiMeid" -> "864465028854206",
+        "otherImeiMeid" -> "864465028854206",
+        "purchaseDate" -> "12-03-2013",
+        "contactNo" -> "8375919908",
+        "email" -> "s@gmail.com",
+        "regType" -> "stolen",
+        "document" -> "s.jpg",
+        "description" -> "test",
+        "otherMobileBrand" -> "nokia",
+        "otherMobileModel" -> "assha")).get
+      status(result) must equalTo(400)
+      contentType(result) must beSome("text/html")
+      charset(result) must beSome("utf-8")
+    }
+  }
+
+  // Java script routes
+  "JavascriptRoutes Action" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/javascriptRoutes"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/javascript")
+    }
+  }
+
+  "redirect mobile status form" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/mobileStatusForm"))
+      status(result) must equalTo(200)
+      contentType(result) must beSome("text/html")
+    }
+  }
+
+  // Admin Pages
+  "redirect to login page with error flash" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/login").withFlash("error" -> "message"))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+      charset(result) must beSome("utf-8")
+    }
+  }
+
+  // Admin Pages
+  "redirect to login page with success flash" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/login").withFlash("success" -> "message"))
+      status(result) must equalTo(OK)
+      contentType(result) must beSome("text/html")
+      charset(result) must beSome("utf-8")
+    }
+  }
+
+  "authenticate login" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(POST, "/authenticate").withFormUrlEncodedBody("email" -> "test", "password" -> "test").withHeaders(CONTENT_TYPE ->
+        "application/x-www-form-urlencoded"))
+      status(result) must equalTo(303)
+      redirectLocation(result) must beSome.which(_ == "/admin/mobiles?status=pending")
+    }
+  }
+
+  "login authentication failed" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(POST, "/authenticate").withFormUrlEncodedBody("email" -> "test", "password" -> "pass").withHeaders(CONTENT_TYPE ->
+        "application/x-www-form-urlencoded"))
+      status(result) must equalTo(400)
+    }
+  }
+
+  "logout Action" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/logout"))
+      status(result) must equalTo(303)
+      redirectLocation(result) must beSome.which(_ == "/login")
+    }
+  }
+
+  "redirect to audit page" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/auditpage"))
+      status(result) must equalTo(303)
+    }
+  }
+  
+  "redirect to mobiles page" in {
+    running(FakeApplication()) {
+      val Some(result) = route(FakeRequest(GET, "/admin/mobiles?status=pending"))
+      status(result) must equalTo(303)
+    }
+  }
+}
diff --git a/test/viewtemplates/TemplateTest.scala b/test/viewtemplates/TemplateTest.scala
new file mode 100644
index 0000000..bca812a
--- /dev/null
+++ b/test/viewtemplates/TemplateTest.scala
@@ -0,0 +1,306 @@
+package viewtemplates;
+
+import org.specs2.mutable._
+import model.repository._
+import play.api.Play.current
+import play.api.cache.Cache
+import play.api.test.FakeApplication
+import play.api.test.Helpers._
+import play.api.test.FakeRequest
+import play.api.mvc.Security
+import utils._
+import play.api.mvc.Security
+import java.util.{ Date, Calendar }
+import play.api.test.WithApplication
+import controllers.ReverseAdminController
+import controllers.ReverseMobileController
+import controllers.ReverseAuditController
+import controllers.ReverseResources
+import controllers.ReverseAuthController
+import controllers.ReverseApplication
+
+class TemplateTest extends Specification{
+  
+  //ReverseAdminController
+
+   "get mobiles URL via ReverseAdminController" in new WithApplication {
+      val testController = new ReverseAdminController()
+      testController.mobiles("pending").url must contain("mobiles")
+
+      val javaScriptTest = new controllers.javascript.ReverseAdminController()
+      javaScriptTest.mobiles.name must contain("mobiles")
+
+      val refTest = new controllers.ref.ReverseAdminController()
+      refTest.mobiles("test").toString must contain("mobiles")
+    }
+   
+   "get approve URL via ReverseAdminController" in new WithApplication {
+      val testController = new ReverseAdminController()
+      testController.approve("123456789012347","approved") .url must contain("approve")
+
+      val refTest = new controllers.ref.ReverseAdminController()
+      refTest.approve("123456789012347","approved").toString must contain("approve")
+    }
+   
+   "get proofDemanded URL via ReverseAdminController" in new WithApplication {
+      val testController = new ReverseAdminController()
+      testController.proofDemanded("123456789012347","approved") .url must contain("proofDemanded")
+
+      val refTest = new controllers.ref.ReverseAdminController()
+      refTest.proofDemanded("123456789012347","approved").toString must contain("proofDemanded")
+    }
+   
+   "get pending URL via ReverseAdminController" in new WithApplication {
+      val testController = new ReverseAdminController()
+      testController.pending("123456789012347") .url must contain("pending")
+
+      val refTest = new controllers.ref.ReverseAdminController()
+      refTest.pending("123456789012347").toString must contain("pending")
+    }
+   
+   "get pending URL via ReverseAdminController" in new WithApplication {
+      val testController = new ReverseAdminController()
+      testController.changeMobileRegType("123456789012347") .url must contain("changeMobileRegType")
+
+      val refTest = new controllers.ref.ReverseAdminController()
+      refTest.changeMobileRegType("123456789012347").toString must contain("changeMobileRegType")
+    }
+   
+    "get pending URL via ReverseAdminController" in new WithApplication {
+      val testController = new ReverseAdminController()
+      testController.changeMobileRegType("123456789012347") .url must contain("changeMobileRegType")
+      
+       val javaScriptTest = new controllers.javascript.ReverseAdminController()
+      javaScriptTest.changeMobileRegType.name must contain("changeMobileRegType")
+
+      val refTest = new controllers.ref.ReverseAdminController()
+      refTest.changeMobileRegType("123456789012347").toString must contain("changeMobileRegType")
+    }
+    
+    "get deleteMobile URL via ReverseAdminController" in new WithApplication {
+      val testController = new ReverseAdminController()
+      testController.deleteMobile("123456789012347") .url must contain("delete")
+      
+       val javaScriptTest = new controllers.javascript.ReverseAdminController()
+      javaScriptTest.deleteMobile.name must contain("delete")
+
+      val refTest = new controllers.ref.ReverseAdminController()
+      refTest.deleteMobile("123456789012347").toString must contain("delete")
+    }
+    
+    //ReverseMobileController
+    
+    "get mobileRegistrationForm URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.mobileRegistrationForm .url must contain("register-stolen-phone")
+      
+       val refTest = new controllers.ref.ReverseMobileController()
+      refTest.mobileRegistrationForm.toString must contain("")
+    }
+    
+     "get mobileRegistrationSecureForm URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.mobileRegistrationSecureForm .url must contain("register-new-phone")
+      
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.mobileRegistrationSecureForm.toString must contain("")
+    }
+     
+     "get brandRegisterForm URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.brandRegisterForm .url must contain("brandForm")
+      
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.brandRegisterForm.toString must contain("")
+    }
+     
+     "get modelRegistrationForm URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.modelRegistrationForm .url must contain("modelRegistrationForm")
+      
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.modelRegistrationForm.toString must contain("")
+    }
+     
+     "get mobileRegistration URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.mobileRegistration .url must contain("mobileRegistration")
+
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.mobileRegistration.toString must contain("mobileRegistration")
+    }
+     
+     "get mobileRegistration URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.mobileRegistration .url must contain("mobileRegistration")
+
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.mobileRegistration.toString must contain("mobileRegistration")
+    }
+     
+     "get checkMobileStatus URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.checkMobileStatus("123456789012347","user") .url must contain("mobileStatus")
+      
+       val javaScriptTest = new controllers.javascript.ReverseMobileController()
+      javaScriptTest.checkMobileStatus.name must contain("checkMobileStatus")
+
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.checkMobileStatus("123456789012347","user").toString must contain("checkMobileStatus")
+    }
+     
+     "get getModels URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.getModels(1) .url must contain("mobileModel")
+
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.getModels(1).toString must contain("getModels")
+    }
+     
+      "get mobileStatus URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.mobileStatus .url must contain("mobileStatusForm")
+    }
+      
+       "get isImeiExist URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.isImeiExist("123456789012347") .url must contain("isImeiExist")
+
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.isImeiExist("123456789012347").toString must contain("isImeiExist")
+    }
+       
+       "get saveBrand URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.saveBrand .url must contain("saveMobileName")
+
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.saveBrand.toString must contain("saveBrand")
+    }
+       
+        "get saveModel URL via ReverseMobileController" in new WithApplication {
+      val testController = new ReverseMobileController()
+      testController.saveModel .url must contain("createMobileModel")
+
+      val refTest = new controllers.ref.ReverseMobileController()
+      refTest.saveModel.toString must contain("saveModel")
+    }
+        
+   //ReverseAuditController
+     "get auditPage URL via ReverseAuditController" in new WithApplication {
+      val testController = new ReverseAuditController()
+      testController.auditPage .url must contain("auditpage")
+
+      val refTest = new controllers.ref.ReverseAuditController()
+      refTest.auditPage.toString must contain("auditPage")
+    }   
+     
+     "get timestampsByIMEI URL via ReverseAuditController" in new WithApplication {
+      val testController = new ReverseAuditController()
+      testController.timestampsByIMEI .url must contain("auditIMEID")
+
+      val refTest = new controllers.ref.ReverseAuditController()
+      refTest.timestampsByIMEI.toString must contain("timestampsByIMEI")
+    }
+
+     "get allTimestamps URL via ReverseAuditController" in new WithApplication {
+      val testController = new ReverseAuditController()
+      testController.allTimestamps .url must contain("auditAllRecords")
+
+      val refTest = new controllers.ref.ReverseAuditController()
+      refTest.allTimestamps.toString must contain("allTimestamps")
+    }
+     
+     "get registrationRecordsByYear URL via ReverseAuditController" in new WithApplication {
+      val testController = new ReverseAuditController()
+      testController.registrationRecordsByYear("2015") .url must contain("registrationRecord")
+
+      val refTest = new controllers.ref.ReverseAuditController()
+      refTest.registrationRecordsByYear("2015").toString must contain("registrationRecord")
+    }
+
+     //ReverseResources
+     
+     "get blog URL via ReverseResources" in new WithApplication {
+      val testController = new ReverseResources()
+      testController.blog().url must contain("blog")
+      
+      val refTest = new controllers.ref.ReverseResources()
+      refTest.blog().toString must contain("blog")
+
+    }
+     
+     "get contactUs URL via ReverseResources" in new WithApplication {
+      val testController = new ReverseResources()
+      testController.contactUs().url must contain("contact-us")
+      
+      val refTest = new controllers.ref.ReverseResources()
+      refTest.contactUs().toString must contain("")
+
+    }
+     
+     "get faq URL via ReverseResources" in new WithApplication {
+      val testController = new ReverseResources()
+      testController.faq().url must contain("faq")
+      
+      val refTest = new controllers.ref.ReverseResources()
+      refTest.faq().toString must contain("faq")
+
+    }
+     
+     "get discussionforum URL via ReverseResources" in new WithApplication {
+      val testController = new ReverseResources()
+      testController.discussionforum().url must contain("discussionforum")
+      
+      val refTest = new controllers.ref.ReverseResources()
+      refTest.discussionforum().toString must contain("discussionforum")
+
+    }
+     
+     //ReverseAuthController
+     
+     "get login URL via ReverseAuthcontroller" in new WithApplication {
+      val testController = new ReverseAuthController()
+      testController.login().url must contain("login")
+      
+      val refTest = new controllers.ref.ReverseAuthController()
+      refTest.login().toString must contain("login")
+
+    }
+     
+     "get authenticate URL via ReverseAuthcontroller" in new WithApplication {
+      val testController = new ReverseAuthController()
+      testController.authenticate().url must contain("authenticate")
+      
+      val refTest = new controllers.ref.ReverseAuthController()
+      refTest.authenticate().toString must contain("authenticate")
+
+    }
+     
+     "get logout URL via ReverseAuthcontroller" in new WithApplication {
+      val testController = new ReverseAuthController()
+      testController.logout().url must contain("logout")
+      
+      val refTest = new controllers.ref.ReverseAuthController()
+      refTest.logout().toString must contain("logout")
+    }
+     
+     //ReverseApplication
+     
+     "get index URL via ReverseApplication" in new WithApplication {
+      val testController = new ReverseApplication()
+      testController.index().url must contain("")
+      
+      val refTest = new controllers.ref.ReverseApplication()
+      refTest.index().toString must contain("")
+    }
+     
+     "get javascriptRoutes URL via ReverseApplication" in new WithApplication {
+      val testController = new ReverseApplication()
+      testController.javascriptRoutes().url must contain("")
+      
+      val refTest = new controllers.ref.ReverseApplication()
+      refTest.javascriptRoutes().toString must contain("")
+    }
+}
+
