diff --git a/.travis.yml b/.travis.yml
index 0085995c9..942155601 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,27 @@
 language: php
+
+php:
+  - '7.2'
+
 sudo: false
+
 cache:
   directories:
     - $HOME/.composer/cache/files
-install: travis_retry composer install --no-interaction --prefer-dist
+    - $HOME/.npm
+    - node_modules
+
+before_install:
+  - nvm install 'lts/*'
+  - npm i -g npm
+
+install:
+  - travis_retry composer install --no-interaction --prefer-dist
+  - npm install --no-audit --no-progress --quiet
+  - npm run production
+
 script: vendor/bin/phpunit --verbose
+
 notifications:
   slack:
     rooms:
diff --git a/app/Events/StartTimer.php b/app/Events/StartTimer.php
index 351c03f7d..53f774581 100644
--- a/app/Events/StartTimer.php
+++ b/app/Events/StartTimer.php
@@ -11,15 +11,16 @@
 class StartTimer implements ShouldBroadcast
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
+    public $timerData;
 
     /**
      * Create a new event instance.
      *
      * @return void
      */
-    public function __construct()
+    public function __construct($timerData = [])
     {
-        //
+        $this->timerData = $timerData;
     }
 
     /**
@@ -31,4 +32,9 @@ public function broadcastOn()
     {
         return new PrivateChannel('stopwatch-event.'.getLoggedInUserId());
     }
+
+    public function broadcastWith()
+    {
+        return $this->timerData;
+    }
 }
diff --git a/app/Http/Controllers/TimeEntryController.php b/app/Http/Controllers/TimeEntryController.php
index acaad1290..8ed2c93c2 100644
--- a/app/Http/Controllers/TimeEntryController.php
+++ b/app/Http/Controllers/TimeEntryController.php
@@ -203,9 +203,9 @@ public function getTasks($projectId, Request $request)
     /**
      * @return \Illuminate\Http\JsonResponse
      */
-    public function getStartTimer()
+    public function getStartTimer(Request $request)
     {
-        $this->timeEntryRepository->broadcastStartTimerEvent();
+        $this->timeEntryRepository->broadcastStartTimerEvent($request->all());
 
         return $this->sendSuccess('Start timer broadcasted successfully.');
     }
diff --git a/app/Http/Requests/CreateProjectRequest.php b/app/Http/Requests/CreateProjectRequest.php
index 2c441fb74..965c5019e 100644
--- a/app/Http/Requests/CreateProjectRequest.php
+++ b/app/Http/Requests/CreateProjectRequest.php
@@ -33,7 +33,7 @@ public function authorize()
     public function rules()
     {
         $rules = Project::$rules;
-        $rules['prefix'] = 'required|alpha_num|max:4|min:2|unique:projects,prefix';
+        $rules['prefix'] = 'required|alpha_num|max:6|min:2|unique:projects,prefix';
 
         return $rules;
     }
diff --git a/app/Http/Requests/UpdateUserProfileRequest.php b/app/Http/Requests/UpdateUserProfileRequest.php
index 96a50114f..2138fc7b8 100644
--- a/app/Http/Requests/UpdateUserProfileRequest.php
+++ b/app/Http/Requests/UpdateUserProfileRequest.php
@@ -35,10 +35,12 @@ public function rules()
     {
         $id = Auth::user()->id;
         $rules = [
-            'name'  => 'required|unique:users,name,'.$id,
-            'email' => 'required|email|unique:users,email,'.$id.'|regex:/^[\w\-\.\+]+\@[a-zA-Z0-9\.\-]+\.[a-zA-z0-9]{2,4}$/',
-            'phone' => 'nullable|numeric|digits:10',
-            'photo' => 'mimes:jpeg,jpg,png',
+            'name'                  => 'required|unique:users,name,'.$id,
+            'email'                 => 'required|email|unique:users,email,'.$id.'|regex:/^[\w\-\.\+]+\@[a-zA-Z0-9\.\-]+\.[a-zA-z0-9]{2,4}$/',
+            'phone'                 => 'nullable|numeric|digits:10',
+            'photo'                 => 'mimes:jpeg,jpg,png',
+            'password'              => 'nullable|min:6|required_with:password_confirmation|same:password_confirmation',
+            'password_confirmation' => 'nullable|min:6',
         ];
 
         return $rules;
diff --git a/app/Models/ActivityType.php b/app/Models/ActivityType.php
index c1a614b51..dc65484a8 100644
--- a/app/Models/ActivityType.php
+++ b/app/Models/ActivityType.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Eloquent as Model;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * App\Models\ActivityType.
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 2b68b438b..f69aef8a3 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Eloquent as Model;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * App\Models\Client.
diff --git a/app/Models/Project.php b/app/Models/Project.php
index f325fabe3..f4073fc17 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Eloquent as Model;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * App\Models\Project.
diff --git a/app/Models/Report.php b/app/Models/Report.php
index e9cd5c350..ab20d4ef4 100644
--- a/app/Models/Report.php
+++ b/app/Models/Report.php
@@ -3,7 +3,7 @@
 namespace App\Models;
 
 use Carbon\Carbon;
-use Eloquent as Model;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * App\Models\Report.
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index eac898698..c59ba2d1a 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use Eloquent as Model;
+use Illuminate\Database\Eloquent\Model;
 
 /**
  * App\Models\Tag.
diff --git a/app/Models/Task.php b/app/Models/Task.php
index a2b737b80..f3afdda18 100644
--- a/app/Models/Task.php
+++ b/app/Models/Task.php
@@ -3,8 +3,8 @@
 namespace App\Models;
 
 use Carbon\Carbon;
-use Eloquent as Model;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
diff --git a/app/Models/TimeEntry.php b/app/Models/TimeEntry.php
index aaed60377..b153f0f53 100644
--- a/app/Models/TimeEntry.php
+++ b/app/Models/TimeEntry.php
@@ -2,8 +2,8 @@
 
 namespace App\Models;
 
-use Eloquent as Model;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -59,6 +59,7 @@ class TimeEntry extends Model
     use SoftDeletes;
 
     public $table = 'time_entries';
+    public $appends = ['entry_type_string'];
 
     const STOPWATCH = 1;
     const VIA_FORM = 2;
@@ -149,4 +150,13 @@ public function scopeOfCurrentUser(Builder $query)
     {
         return $query->ofUser(getLoggedInUserId());
     }
+
+    public function getEntryTypeStringAttribute()
+    {
+        if ($this->entry_type == self::STOPWATCH) {
+            return 'Stopwatch';
+        }
+
+        return 'Via Form';
+    }
 }
diff --git a/app/Queries/TaskDataTable.php b/app/Queries/TaskDataTable.php
index c1d83a8f8..08443b4de 100644
--- a/app/Queries/TaskDataTable.php
+++ b/app/Queries/TaskDataTable.php
@@ -3,8 +3,8 @@
 namespace App\Queries;
 
 use App\Models\Task;
+use App\Repositories\ProjectRepository;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Auth;
 
 /**
  * Class TaskDataTable.
@@ -18,7 +18,10 @@ class TaskDataTable
      */
     public function get($input = [])
     {
-        $loginUserProjects = Auth::user()->projects()->get()->pluck('name', 'id')->toArray();
+        /** @var ProjectRepository $projectRepo */
+        $projectRepo = app(ProjectRepository::class);
+        $loginUserProjects = $projectRepo->getLoginUserAssignProjectsArr();
+
         $query = Task::whereIn('project_id', array_keys($loginUserProjects))
             ->leftJoin('projects as p', 'p.id', '=', 'tasks.project_id')
             ->with(['project', 'taskAssignee', 'createdUser'])
diff --git a/app/Queries/TimeEntryDataTable.php b/app/Queries/TimeEntryDataTable.php
index 138e73c3e..2c43c5bff 100644
--- a/app/Queries/TimeEntryDataTable.php
+++ b/app/Queries/TimeEntryDataTable.php
@@ -21,8 +21,7 @@ class TimeEntryDataTable
     public function get($input)
     {
         /** @var TimeEntry $query */
-        $query = TimeEntry::with(['task.project', 'user', 'activityType'])
-            ->select('time_entries.*', \DB::raw("IF(IFNULL(entry_type,1)=1,'Stopwatch','Via Form') as entry_type_string"));
+        $query = TimeEntry::with(['task.project', 'user', 'activityType'])->select('time_entries.*');
 
         /** @var User $user */
         $user = Auth::user();
@@ -33,11 +32,11 @@ function (Builder $q) use ($input) {
             });
         $query->when(isset($input['filter_project']) && !empty($input['filter_project']),
             function (Builder $q) use ($input) {
+                $filterUserId = (isset($input['filter_user']) && !empty($input['filter_user'])) ? $input['filter_user'] : getLoggedInUser()->id;
                 $taskIds = Task::whereProjectId($input['filter_project'])
-                    ->where('status', '=', Task::STATUS_ACTIVE)
-                    ->where(function ($q) {
-                        $q->whereHas('taskAssignee', function ($q) {
-                            $q->where('user_id', getLoggedInUser()->id);
+                    ->where(function ($q) use ($filterUserId) {
+                        $q->whereHas('taskAssignee', function ($q) use ($filterUserId) {
+                            $q->where('user_id', $filterUserId);
                         });
                     })->get()->pluck('id')->toArray();
                 $q->whereIn('task_id', $taskIds);
diff --git a/app/Repositories/ProjectRepository.php b/app/Repositories/ProjectRepository.php
index c2fb3be60..8947f90a4 100644
--- a/app/Repositories/ProjectRepository.php
+++ b/app/Repositories/ProjectRepository.php
@@ -47,6 +47,12 @@ public function model()
      */
     public function getLoginUserAssignProjectsArr()
     {
+        $loggedInUser = getLoggedInUser();
+
+        if ($loggedInUser->can('manage_projects')) {
+            return $this->getProjectsList()->toArray();
+        }
+
         return Auth::user()->projects()->orderBy('name')->get()->pluck('name', 'id')->toArray();
     }
 
diff --git a/app/Repositories/ReportRepository.php b/app/Repositories/ReportRepository.php
index 0db9c01af..a61abb802 100644
--- a/app/Repositories/ReportRepository.php
+++ b/app/Repositories/ReportRepository.php
@@ -145,12 +145,12 @@ public function updateReportFilter($input, $report)
 
         $clientId = $this->getClientId($report->id);
         if ($input['client_id'] != 0) {
-            if ($input['client_id'] !== $clientId) {
+            if ($input['client_id'] != $clientId) {
                 $result[] = $this->createFilter($report->id, $input['client_id'], Client::class);
             }
         }
 
-        if (!empty($clientId) && $input['client_id'] !== $clientId) {
+        if (!empty($clientId) && $input['client_id'] != $clientId) {
             ReportFilter::ofParamType(Client::class)->whereParamId($clientId)->delete();
         }
 
diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php
index bb538063a..821303be3 100644
--- a/app/Repositories/TaskRepository.php
+++ b/app/Repositories/TaskRepository.php
@@ -16,6 +16,7 @@
 use DB;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Symfony\Component\HttpFoundation\File\Exception\UploadException;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
@@ -66,7 +67,7 @@ public function find($id, $columns = ['*'])
     /**
      * @param array $input
      *
-     * @return Task|\Illuminate\Database\Eloquent\Model
+     * @return Task
      */
     public function store($input)
     {
@@ -261,7 +262,8 @@ public function attachTags($task, $tags)
     }
 
     /**
-     * @param int $id
+     * @param int   $id
+     * @param array $input
      *
      * @return Task
      */
@@ -269,7 +271,7 @@ public function getTaskDetails($id, $input = [])
     {
         if (isset($input['user_id']) && $input['user_id'] > 0) {
             $task = Task::with([
-                'timeEntries' => function ($query) use ($input) {
+                'timeEntries' => function (HasMany $query) use ($input) {
                     $query->where('time_entries.user_id', '=', $input['user_id'])
                         ->with('user');
                 },
@@ -284,6 +286,7 @@ public function getTaskDetails($id, $input = [])
             $totalDuration = sprintf('%02d Hours and %02d Minutes', floor($minutes / 60), $minutes % 60);
         }
         $task->totalDuration = $totalDuration;
+        $task->totalDurationMin = $minutes;
 
         return $task;
     }
@@ -349,10 +352,10 @@ public function uploadFile($id, $file)
         $destinationPath = public_path(Task::PATH);
         $task = $this->findOrFail($id);
 
-        try {
-            $fileName = TaskAttachment::makeAttachment($file, TaskAttachment::PATH);
-            $attachment = new TaskAttachment(['task_id' => $task->id, 'file' => $fileName]);
+        $fileName = TaskAttachment::makeAttachment($file, TaskAttachment::PATH);
+        $attachment = new TaskAttachment(['task_id' => $task->id, 'file' => $fileName]);
 
+        try {
             DB::beginTransaction();
             $task->attachments()->save($attachment);
             DB::commit();
@@ -424,7 +427,6 @@ public function getAttachments($id)
     public function addComment($input)
     {
         $input['created_by'] = Auth::id();
-        $input['comment'] = $input['comment'];
         $comment = Comment::create($input);
 
         return Comment::with('createdUser')->findOrFail($comment->id);
diff --git a/app/Repositories/TimeEntryRepository.php b/app/Repositories/TimeEntryRepository.php
index 39198d56c..33d8fdd12 100644
--- a/app/Repositories/TimeEntryRepository.php
+++ b/app/Repositories/TimeEntryRepository.php
@@ -191,9 +191,9 @@ public function checkDuplicateEntry($input, $id = null)
         }
     }
 
-    public function broadcastStartTimerEvent()
+    public function broadcastStartTimerEvent($input)
     {
-        broadcast(new StartTimer())->toOthers();
+        broadcast(new StartTimer($input))->toOthers();
     }
 
     public function broadcastStopTimerEvent()
diff --git a/composer.json b/composer.json
index a5cfb2fbc..7e1a902ee 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "infyomlabs/infy-tracker",
   "type": "project",
-  "version": "1.8.0-alpha",
+  "version": "1.8.1-alpha",
   "description": "Create Projects / Tasks, Track Time, Show Daily Reports",
     "keywords": [
       "time",
diff --git a/database/factories/TaskFactory.php b/database/factories/TaskFactory.php
index da29bc3b7..46a58a230 100644
--- a/database/factories/TaskFactory.php
+++ b/database/factories/TaskFactory.php
@@ -16,6 +16,7 @@
         'description' => $faker->text,
         'project_id'  => $project->id,
         'due_date'    => $faker->dateTime,
+        'status'      => Task::STATUS_ALL,
         'task_number' => $faker->unique()->randomDigitNotNull,
     ];
 });
diff --git a/phpunit.xml b/phpunit.xml
index 7599e1c7b..d346d4cd8 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,6 +13,10 @@
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
 
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
+
         <testsuite name="Integration">
             <directory suffix="Test.php">./tests/Integration</directory>
         </testsuite>
@@ -24,10 +28,6 @@
         <testsuite name="Controllers">
             <directory suffix="Test.php">./tests/Controllers</directory>
         </testsuite>
-
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
diff --git a/resources/assets/js/custom.js b/resources/assets/js/custom.js
index f9dabe4f6..d1bf03c29 100644
--- a/resources/assets/js/custom.js
+++ b/resources/assets/js/custom.js
@@ -165,5 +165,3 @@ window.displaySuccessMessage = function (message) {
         position: 'top-right',
     });
 };
-//modal not closed on click outside
-$('.modal').modal({show: false, backdrop: 'static'});
\ No newline at end of file
diff --git a/resources/assets/js/profile/profile.js b/resources/assets/js/profile/profile.js
index e5c81550e..a9d83f822 100644
--- a/resources/assets/js/profile/profile.js
+++ b/resources/assets/js/profile/profile.js
@@ -1,5 +1,9 @@
 $('#editProfileForm').submit(function (event) {
     event.preventDefault();
+    isValidate = validatePassword();
+    if(!isValidate){
+        return false;
+    }
     let loadingButton = jQuery(this).find("#btnEditSave");
     loadingButton.button('loading');
     $.ajax({
@@ -85,4 +89,35 @@ $(document).on('keyup', '#name', function (e) {
             $('#prefix').val(txtVal.toLocaleUpperCase());
         }
     }
-});
\ No newline at end of file
+});
+
+$(".confirm-pwd").hide();
+$(document).on('blur', '#pfNewPassword', function () {
+    let password = $("#pfNewPassword").val();
+    if(password == '' || password.trim() == ''){
+        $(".confirm-pwd").hide();
+        return false;
+    }
+
+    $(".confirm-pwd").show();
+});
+$(document).on('blur', '#pfNewConfirmPassword', function () {
+    let confirmPassword = $("#pfNewConfirmPassword").val();
+    if(confirmPassword == '' || confirmPassword.trim() == ''){
+        $(".confirm-pwd").hide();
+        return false;
+    }
+
+    $(".confirm-pwd").show();
+});
+
+function validatePassword() {
+    let password = $("#pfNewPassword").val().trim();
+    let confirmPassword = $("#pfNewConfirmPassword").val().trim();
+
+    if((confirmPassword == '' && password != '') || (confirmPassword != '' && password == '')) {
+        $('#editProfileValidationErrorsBox').show().html("Please enter password and confirm password");
+        return false;
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/resources/assets/js/projects/project.js b/resources/assets/js/projects/project.js
index 00c4d5445..fc5e19cdf 100644
--- a/resources/assets/js/projects/project.js
+++ b/resources/assets/js/projects/project.js
@@ -20,7 +20,6 @@ let tbl = $('#projects_table').DataTable({
     columnDefs: [
         {
             "targets": [0],
-            "orderable": false,
             "className": 'text-center',
             "width": '7%'
         },
diff --git a/resources/assets/js/report/report.js b/resources/assets/js/report/report.js
index db8c64ce0..e2a152a06 100644
--- a/resources/assets/js/report/report.js
+++ b/resources/assets/js/report/report.js
@@ -20,6 +20,8 @@ $('#tagIds').select2({
 });
 $('#filterCreatedBy').select2();
 
+$(".select2-search__field").css('width','100%');
+
 $('#start_date').datetimepicker({
     format: 'YYYY-MM-DD',
     useCurrent: true,
@@ -181,6 +183,7 @@ let tbl = $('#report_table').DataTable({
         },
         {
             data: 'user.name',
+            defaultContent: "",
             name: 'user.name'
         },
         {
diff --git a/resources/assets/js/task/task.js b/resources/assets/js/task/task.js
index c4d29df17..c139adec1 100644
--- a/resources/assets/js/task/task.js
+++ b/resources/assets/js/task/task.js
@@ -277,6 +277,7 @@ $(document).on('click', '.taskDetails', function (event) {
     startLoader();
     $('#no-record-info-msg').hide();
     $('#taskDetailsTable').hide();
+    $('.time-entry-data').hide();
 
     $.ajax({
         url: taskUrl + id + '/' + 'users',
@@ -305,6 +306,10 @@ $(document).on('click', '.taskDetails', function (event) {
     });
 });
 
+function formatCollapsableRow(data) {
+    return '<div style="padding-left:50px;">' + data.note + '</div>';
+}
+
 $(document).on('change', '#task_users', function () {
     let taskId = $(this).attr('data-task_id');
     let taskUserId = $(this).val().split('-');
@@ -328,42 +333,64 @@ $(document).on('change', '#task_users', function () {
         }
     });
 });
-
 window.drawTaskDetailTable = function (data) {
-    stopLoader();
     if (data.totalDuration === 0) {
         $('#no-record-info-msg').show();
-        $('#taskDetailsTable').hide();
+        $('.time-entry-data').hide();
+        stopLoader();
         return true;
-    } else {
-        $('#taskDetailsTable').show();
-        $('#user-drop-down-body').show();
-        $('#no-record-info-msg').hide();
     }
-    var table = $("#taskDetailsTable tbody").html("");
-    let totalMin = 0;
-    $.each(data.time_entries, function (idx, elem) {
-        totalMin = totalMin + elem.duration;
-        table.append(
-            "<tr>" +
-            "<td id='tdCollapse" + elem.id + "' onclick='manageCollapseIcon(" + JSON.stringify(elem.id) + ")' class='clickable' data-toggle='collapse' data-target='#collapse" + elem.id + "' aria-expanded='false' aria-controls='collapse" + elem.id + "'>" +
-            "<a title='Expand' class='btn btn-success action-btn btn-sm'><span class='fa fa-plus-circle action-icon'></span></a></td>" +
-            "<td>" + elem.user.name + "</td>" +
-            "<td>" + elem.start_time + "</td>" +
-            "<td>" + elem.end_time + "</td>" +
-            "<td>" + elem.duration + "</td>" +
-            "<td><a title='Edit' class='btn action-btn btn-primary btn-sm mr-1' onclick='renderTimeEntry(" + elem.id + ")' ><i class='cui-pencil action-icon'></i></a>" +
-            "<a title='Delete' class='btn action-btn btn-danger btn-sm'  onclick='deleteTimeEntry(" + elem.id + ")'><i class='cui-trash action-icon'></i></a></td>" +
-            "</tr>"
-        );
-        table.append("<tr id='collapse" + elem.id + "' class='collapse'><td colspan='6'><div class='pull-left'>" +
-            "<b>Notes: </b><pre>" + elem.note + "</pre>" +
-            "</div></td></tr>");
+
+    let taskDetailsTable = $('#taskDetailsTable').DataTable({
+        destroy: true,
+        paging: true,
+        data: data.time_entries,
+        searching: false,
+        lengthChange: false,
+        columns: [
+            {
+                className: 'details-control',
+                defaultContent: "<a title='Expand' class='btn btn-success collapse-icon action-btn btn-sm'><span class='fa fa-plus-circle action-icon'></span></a>",
+                data: null,
+                orderable: false,
+            },
+            {data: "user.name"},
+            {data: "start_time"},
+            {data: "end_time"},
+            {data: "duration"},
+            {
+                orderable: false,
+                data: function (data) {
+                    return "<a title='Edit' class='btn action-btn btn-primary btn-sm mr-1' onclick='renderTimeEntry(" + data.id + ")' ><i class='cui-pencil action-icon'></i></a>" +
+                        "<a title='Delete' class='btn action-btn btn-danger btn-sm'  onclick='deleteTimeEntry(" + data.id + ")'><i class='cui-trash action-icon'></i></a>";
+                }
+            }
+        ],
     });
-    table.append("<tr>" +
-        "<td colspan='3'><strong>Total duration in hours : " + data.totalDuration + "</strong></td>" +
-        "<td colspan='3'><strong>Total duration in minutes:" + totalMin + "</strong></td>" +
-        "</tr>");
+
+    $('.time-entry-data').show();
+    $('#taskDetailsTable').show();
+    $('#user-drop-down-body').show();
+    $('#no-record-info-msg').hide();
+    stopLoader();
+
+    $('#taskDetailsTable tbody').on('click', 'td.details-control', function () {
+        var tr = $(this).closest('tr');
+        var row = taskDetailsTable.row(tr);
+
+        if (row.child.isShown()) {
+            // This row is already open - close it
+            row.child.hide();
+            tr.removeClass('shown');
+        } else {
+            // Open this row
+            row.child(formatCollapsableRow(row.data())).show();
+            tr.addClass('shown');
+        }
+    });
+
+    $("#taskDetailsTable_wrapper").css('width', "100%");
+    $("#total-duration").html("<strong>Total duration: " + data.totalDuration + " || " + data.totalDurationMin + " Minutes</strong>");
 };
 
 $('#addNewForm').submit(function (event) {
@@ -467,6 +494,15 @@ $(function () {
     }
 });
 
+$(document).on('click', '.collapse-icon', function () {
+    let isShow = $(this).parent().parent().hasClass('shown');
+    if(isShow) {
+        $(this).children().removeClass('fa-plus-circle').addClass("fa-minus-circle");
+    } else {
+        $(this).children().removeClass('fa-minus-circle').addClass("fa-plus-circle");
+    }
+});
+
 window.manageCollapseIcon = function (id) {
     var isExpanded = $('#tdCollapse' + id).attr('aria-expanded');
     if (isExpanded == 'true') {
@@ -573,3 +609,6 @@ function loadProjectAssignees(projectId, selector) {
         }
     });
 }
+
+//modal not closed on click outside
+$('.modal').modal({show: false, backdrop: 'static'});
diff --git a/resources/assets/js/task/task_detail.js b/resources/assets/js/task/task_detail.js
index 0ee0bd08f..84d08c33f 100644
--- a/resources/assets/js/task/task_detail.js
+++ b/resources/assets/js/task/task_detail.js
@@ -292,12 +292,12 @@ function addCommentSection(comment) {
 };
 
 $('#btnComment').click(function (event) {
-    let loadingButton = $(this);
-    loadingButton.button('loading');
     let comment = CKEDITOR.instances.comment.getData();
     if(comment == '' || comment.trim() == ''){
         return false;
     }
+    let loadingButton = $(this);
+    loadingButton.button('loading');
     $.ajax({
         url: baseUrl + 'tasks/' + taskId+ '/comments',
         type: 'post',
@@ -456,3 +456,6 @@ CKEDITOR.replace( 'editDesc', {
 $(document).on('click', '#btnCancel', function () {
     CKEDITOR.instances.comment.setData('');
 });
+
+//modal not closed on click outside
+$('.modal').modal({show: false, backdrop: 'static'});
diff --git a/resources/assets/js/time_tracker/time_tracker.js b/resources/assets/js/time_tracker/time_tracker.js
index 9f5e3659b..05fe3b4eb 100644
--- a/resources/assets/js/time_tracker/time_tracker.js
+++ b/resources/assets/js/time_tracker/time_tracker.js
@@ -15,14 +15,14 @@ window.Echo.private(`stopwatch-event.${loggedInUserId}`)
         enableTimerData();
         stopTimerData();
     })
-    .listen('StartTimer', () => {
-        startWatch();
-        let projectId = localStorage.getItem('project_id');
-        let taskId = localStorage.getItem('task_id');
-        let activityId = localStorage.getItem('activity_id');
-        $('#tmProjectId').val(projectId).trigger('change').attr('disabled', true);
-        $('#tmTaskId').val(taskId).trigger('change').attr('disabled', true);
-        $('#tmActivityId').val(activityId).trigger('change').attr('disabled', true);
+    .listen('StartTimer', (result) => {
+        $('#tmProjectId').val(result.project).trigger('change').attr('disabled', true);
+        $('#tmTaskId').val(result.task).trigger('change').attr('disabled', true);
+        $('#tmActivityId').val(result.activity).trigger('change').attr('disabled', true);
+        setTimeout(function () {
+            $('#tmTaskId').val(result.task).trigger('change').attr('disabled', true);
+        }, 1500);
+        setTimerData(result.activity, result.task, result.project);
     });
 
 $('#tmActivityId,#tmTaskId,#tmProjectId').select2({
@@ -39,8 +39,8 @@ window.loadProjects = function() {
             $(result.data).each(function (i, e) {
                 $("#tmProjectId").append($('<option></option>').attr('value', e.id).text(e.name));
             });
-            if (localStorage.getItem('clockRunning') !== null) {
-                lastProjectId = localStorage.getItem('project_id');
+            if (getItemFromLocalStorage('clockRunning') !== null) {
+                lastProjectId = getItemFromLocalStorage('project_id');
                 $('#tmProjectId').val(lastProjectId).trigger("change");
                 $('#tmProjectId').attr('disabled', true);
             }
@@ -49,7 +49,7 @@ window.loadProjects = function() {
 };
 
 loadProjects();
-let isClockRunning = localStorage.getItem('clockRunning');
+let isClockRunning = getItemFromLocalStorage('clockRunning');
 $(window).on("load", function () {
     if (isClockRunning == null) {
         getUserLastTaskWork();
@@ -71,14 +71,14 @@ window.showStartTimeButton= function(){
 };
 
 window.startWatch = function () {
-    if(localStorage.getItem('clockRunning') == null) {
+    if(getItemFromLocalStorage('clockRunning') == null) {
         showStartTimeButton();
         return;
     }
     $("#startTimer").hide();
     $("#stopTimer").show();
 
-    var stTime = (localStorage.getItem('start_time') !== null) ? localStorage.getItem('start_time') : getCurrentTime();
+    var stTime = (getItemFromLocalStorage('start_time') !== null) ? getItemFromLocalStorage('start_time') : getCurrentTime();
     var d1 = new Date($.now());
     var d2 = new Date(moment(stTime).format("YYYY-MM-DD HH:mm:ss"));
     var diffMs = parseInt(d1 - d2);
@@ -118,7 +118,7 @@ $('#imgTimer').click(() => {
 });
 
 // if timer is running then set values as it is
-if (localStorage.getItem('clockRunning') !== null) {
+if (getItemFromLocalStorage('clockRunning') !== null) {
     startWatch();
 }
 
@@ -137,7 +137,12 @@ var entryStartTime, entryStopTime = 0;
 function startTimerEvent() {
     $.ajax({
         url: startTimerUrl,
-        type: 'get',
+        type: 'post',
+        data: {
+            'activity' : $('#tmActivityId').val(),
+            'task' : $('#tmTaskId').val(),
+            'project' : $('#tmProjectId').val()
+        },
         success: function () {
         },
         error: function (result) {
@@ -151,30 +156,34 @@ $("#startTimer").click(function (e) {
     var project = $('#tmProjectId').val();
     if (project != '' && activity != '' && (task != '' && !(task == null))) {
         e.preventDefault();
-        $('#tmActivityId').attr('disabled', true);
-        $('#tmTaskId').attr('disabled', true);
-        $('#tmProjectId').attr('disabled', true);
-
-        var setItems = {
-            'user_id': loginUserId,
-            'activity_id': activity,
-            'task_id': task,
-            'project_id': project,
-            'clockRunning': true
-        };
-        setItemToLocalStorage(setItems);
-
-        entryStartTime = getCurrentTime();
-        if (localStorage.getItem('start_time') !== null) {
-            entryStartTime = localStorage.getItem('start_time');
-        } else {
-            localStorage.setItem('start_time', entryStartTime);
-        }
-        startWatch();
+        setTimerData(activity, task, project);
         startTimerEvent();
     }
 });
 
+function setTimerData(activity, task, project) {
+    $('#tmActivityId').attr('disabled', true);
+    $('#tmTaskId').attr('disabled', true);
+    $('#tmProjectId').attr('disabled', true);
+
+    var setItems = {
+        'user_id': loginUserId,
+        'activity_id': activity,
+        'task_id': task,
+        'project_id': project,
+        'clockRunning': true
+    };
+    setItemToLocalStorage(setItems);
+
+    entryStartTime = getCurrentTime();
+    if (getItemFromLocalStorage('start_time') !== null) {
+        entryStartTime = getItemFromLocalStorage('start_time');
+    } else {
+        setItemToLocalStorage({'start_time': entryStartTime});
+    }
+    startWatch();
+}
+
 $("#stopTimer").click(function (e) {
     e.preventDefault();
     $(this).attr('disabled', 'true');
@@ -207,7 +216,7 @@ function stopTime() {
 }
 
 function storeTimeEntry() {
-    let startTime = localStorage.getItem('start_time');
+    let startTime = getItemFromLocalStorage('start_time');
     let endTime = getCurrentTime();
 
     $.ajax({
@@ -263,13 +272,13 @@ function getCurrentTime(datetime = null) {
 
 function setItemToLocalStorage(items) {
     $.each(items, function (key, value) {
-        localStorage.setItem(key, value);
+        localStorage.setItem(key+'_'+loggedInUserId, value);
     });
 }
 
 function removeItemsFromLocalStorage(items) {
     $.each(items, function (index, value) {
-        localStorage.removeItem(value);
+        localStorage.removeItem(value+'_'+loggedInUserId);
     });
 }
 
@@ -289,8 +298,8 @@ function loadTimerData(projectId) {
             $('#tmTaskId').find('option').remove().end().append('<option value="">Select Task</option>');
             $('#tmTaskId').val("").trigger('change');
 
-            let drpTaskId = localStorage.getItem('task_id');
-            let drpActivityId = localStorage.getItem('activity_id');
+            let drpTaskId = getItemFromLocalStorage('task_id');
+            let drpActivityId = getItemFromLocalStorage('activity_id');
             let isTaskEmpty = true;
             $(result.data.tasks).each(function (i, e) {
                 $("#tmTaskId").append($('<option></option>').attr('value', e.id).text(e.title));
@@ -307,7 +316,7 @@ function loadTimerData(projectId) {
 
             $("#tmTaskId").removeAttr('disabled');
             // if timer is running then set values as it is
-            if (localStorage.getItem('clockRunning') !== null) {
+            if (getItemFromLocalStorage('clockRunning') !== null) {
                 $('#tmActivityId').val(drpActivityId).trigger("change");
                 $('#tmTaskId').val(drpTaskId).trigger("change");
 
@@ -349,3 +358,7 @@ function getUserLastTaskWork() {
         }
     });
 }
+
+function getItemFromLocalStorage(item) {
+    return localStorage.getItem(item+'_'+loggedInUserId);
+}
diff --git a/resources/assets/js/users/user.js b/resources/assets/js/users/user.js
index 5b7eb0b1a..a6cd92def 100644
--- a/resources/assets/js/users/user.js
+++ b/resources/assets/js/users/user.js
@@ -11,7 +11,7 @@ $(function () {
 var tbl = $('#users_table').DataTable({
     processing: true,
     serverSide: true,
-    "order": [[0, "desc"]],
+    "order": [[0, "asc"]],
     ajax: {
         url: usersUrl,
     },
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index d7f9ef740..c675b5982 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -45,15 +45,12 @@
                 <span class="pr-3 align-middle">{!! Auth::user()->name !!}</span>
             </a>
             <div class="dropdown-menu dropdown-menu-right">
-                <div class="dropdown-header text-center">
-                    <strong>Account</strong>
-                </div>
                 <a href="#" class="dropdown-item btn btn-primary btn btn-default btn-flat edit-profile"
                    data-toggle="modal" data-id="{{ getLoggedInUserId() }}">
                     <i class="fa fa-user"></i>Profile
                 </a>
                 <a class="dropdown-item" href="{!! url('/logout') !!}" class="btn btn-default btn-flat"
-                   onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
+                   onclick="event.preventDefault(); localStorage.clear(); document.getElementById('logout-form').submit();">
                     <i class="fa fa-lock"></i>Logout
                 </a>
                 <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
diff --git a/resources/views/layouts/menu.blade.php b/resources/views/layouts/menu.blade.php
index 5548956f5..a2b0db6f6 100644
--- a/resources/views/layouts/menu.blade.php
+++ b/resources/views/layouts/menu.blade.php
@@ -12,14 +12,6 @@
 </li>
 @endpermission
 
-@permission('manage_projects')
-<li class="nav-item {{ Request::is('projects*') ? 'active' : '' }}">
-    <a class="nav-link" href="{!! route('projects.index') !!}">
-        <i class="fa fa-folder-open nav-icon" aria-hidden="true"></i>&nbsp;&nbsp;Projects
-    </a>
-</li>
-@endpermission
-
 @permission('manage_users')
 <li class="nav-item {{ Request::is('users*') ? 'active' : '' }}">
     <a class="nav-link" href="{!! route('users.index') !!}">
@@ -28,6 +20,14 @@
 </li>
 @endpermission
 
+@permission('manage_projects')
+<li class="nav-item {{ Request::is('projects*') ? 'active' : '' }}">
+    <a class="nav-link" href="{!! route('projects.index') !!}">
+        <i class="fa fa-folder-open nav-icon" aria-hidden="true"></i>&nbsp;&nbsp;Projects
+    </a>
+</li>
+@endpermission
+
 @permission('manage_all_tasks')
 <li class="nav-item {{ Request::is('tasks*') ? 'active' : '' }}">
     <a class="nav-link" href="{!! route('tasks.index') !!}">
diff --git a/resources/views/profile/edit_profile.blade.php b/resources/views/profile/edit_profile.blade.php
index 330b7d2a5..e20f4c628 100644
--- a/resources/views/profile/edit_profile.blade.php
+++ b/resources/views/profile/edit_profile.blade.php
@@ -1,5 +1,5 @@
 <div id="EditProfileModal" class="modal fade" role="dialog">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <!-- Modal content-->
         <div class="modal-content" style="border-radius: 5px !important;">
             <div class="modal-header">
@@ -13,39 +13,41 @@
                 {!! Form::hidden('is_active',1) !!}
                 {{csrf_field()}}
                 <div class="row">
-                    <div class="form-group col-sm-12">
+                    <div class="form-group col-sm-6">
                         {!! Form::label('name', 'Name') !!}<span class="required">*</span>
                         {!! Form::text('name', null, ['id'=>'pfName','class' => 'form-control','required']) !!}
                     </div>
+                    <div class="form-group col-sm-6 d-flex">
+                        <div class="col-sm-6 pl-0">
+                            {!! Form::label('photo', 'Profile Image') !!}
+                            <label class="edit-profile__file-upload"> Choose your file
+                                {!! Form::file('photo',['id'=>'pfImage','class' => 'd-none']) !!}
+                            </label>
+                        </div>
+                        <div class="col-sm-3 preview-image-video-container float-right" style="margin-top: 2px;">
+                            <img id='edit_preview_photo' class="img-thumbnail" width="200px;"
+                                 src="{{asset('assets/img/user-avatar.png')}}"/>
+                        </div>
+                    </div>
                 </div>
                 <div class="row">
-                    <div class="form-group col-sm-12">
+                    <div class="form-group col-sm-6">
                         {!! Form::label('email', 'Email') !!}<span class="required">*</span>
                         {!! Form::text('email', null, ['id'=>'pfEmail','class' => 'form-control','required']) !!}
                     </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
-                        {!! Form::label('password', 'New Password') !!}
-                        {!! Form::text('password', null, ['class' => 'form-control', 'id' => 'pfNewPassword']) !!}
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
+                    <div class="form-group col-sm-6">
                         {!! Form::label('phone', 'Phone') !!}
                         {!! Form::text('phone', null, ['id'=>'pfPhone','class' => 'form-control']) !!}
                     </div>
                 </div>
                 <div class="row">
-                    <div class="form-group col-sm-12">
-                        {!! Form::label('phone', 'Profile Image') !!}
-                        <label class="edit-profile__file-upload"> Choose your file
-                            {!! Form::file('photo',['id'=>'pfImage','class' => 'd-none']) !!}
-                        </label>
-                        <div class="col-sm-4 preview-image-video-container" style="margin-left: -3px;">
-                            <img id='edit_preview_photo' class="img-thumbnail" width="200px;"
-                                 src="{{asset('assets/img/user-avatar.png')}}"/>
-                        </div>
+                    <div class="form-group col-sm-6">
+                        {!! Form::label('password', 'New Password') !!}<span class="required confirm-pwd">*</span>
+                        {!! Form::text('password', null, ['class' => 'form-control', 'id' => 'pfNewPassword']) !!}
+                    </div>
+                    <div class="form-group col-sm-6">
+                        {!! Form::label('password_confirmation', 'Confirm Password') !!}<span class="required confirm-pwd">*</span>
+                        {!! Form::text('password_confirmation', null, ['class' => 'form-control', 'id' => 'pfNewConfirmPassword']) !!}
                     </div>
                 </div>
                 <div class="text-right">
diff --git a/resources/views/projects/edit_modal.blade.php b/resources/views/projects/edit_modal.blade.php
index 369b2b53b..667f27b0f 100644
--- a/resources/views/projects/edit_modal.blade.php
+++ b/resources/views/projects/edit_modal.blade.php
@@ -19,7 +19,7 @@
                 <div class="row">
                     <div class="form-group col-sm-12">
                         {!! Form::label('prefix', 'Prefix') !!}<span class="required">*</span>
-                        {!! Form::text('prefix', '', ['id'=>'edit_prefix','class' => 'form-control','required','maxlength'=>'4','onkeypress'=>'return (event.charCode === 8 || (event.charCode >= 65 && event.charCode <= 90)||(event.charCode >= 95 && event.charCode <= 122))||(event.charCode === 0 || (event.charCode >= 48 && event.charCode <= 57))']) !!}
+                        {!! Form::text('prefix', '', ['id'=>'edit_prefix','class' => 'form-control','required','maxlength'=>'6','onkeypress'=>'return (event.charCode === 8 || (event.charCode >= 65 && event.charCode <= 90)||(event.charCode >= 95 && event.charCode <= 122))||(event.charCode === 0 || (event.charCode >= 48 && event.charCode <= 57))']) !!}
                     </div>
                 </div>
                 <div class="row">
diff --git a/resources/views/reports/report_format.blade.php b/resources/views/reports/report_format.blade.php
index 7772788a8..c25f0b7e3 100644
--- a/resources/views/reports/report_format.blade.php
+++ b/resources/views/reports/report_format.blade.php
@@ -34,6 +34,7 @@
                         </div>
                         <span>{{$project['time']}} ({{round($project['duration'] * 100 / $client['duration'], 2)}} %)</span>
                     </div>
+                    <div class="reports__project-container">
                     @foreach($project['users'] as $user)
                         <div class="reports__developer-task">
                             <div class="reports__developer-row">
@@ -56,6 +57,7 @@
                             </div>
                         </div>
                     @endforeach
+                    </div>
                 @endforeach
                 </div>
             </div>
@@ -63,23 +65,3 @@
     </div>
 </div>
 
-@section('scripts')
-    <script>
-        $( document ).ready(function() {
-            $(".reports__client-row-title").click(function(){
-            $(this).find("i.fa-caret-up").toggleClass("fa-rotate");
-            $(this).parent().parent().find('.collapse-row').slideToggle();
-            });
-
-            $(".reports__project-header").click(function(){
-                $(this).find("i.fa-caret-up").toggleClass("fa-rotate");
-                $(this).parent().next('.reports__developer-task').slideToggle();
-            });
-            $(".reports__developer-header").click(function(){
-                $(this).find("i.fa-caret-up").toggleClass("fa-rotate");
-                $(this).parent().next('.reports__task-container').slideToggle();
-            });
-        });
-
-    </script>
-@endsection
diff --git a/resources/views/reports/show.blade.php b/resources/views/reports/show.blade.php
index e93a383d7..a626f26e8 100644
--- a/resources/views/reports/show.blade.php
+++ b/resources/views/reports/show.blade.php
@@ -36,6 +36,20 @@ class="btn btn-primary filter-container__btn mr-1">
 @endsection
 @section('scripts')
     <script>
+        $( document ).ready(function() {
+            $(".reports__client-row-title").click(function(){
+                $(this).find("i.fa-caret-up").toggleClass("fa-rotate");
+                $(this).parent().parent().find('.collapse-row').slideToggle();
+            });
+            $(".reports__project-header").click(function(){
+                $(this).find("i.fa-caret-up").toggleClass("fa-rotate");
+                $(this).parent().next('.reports__project-container').slideToggle();
+            });
+            $(".reports__developer-header").click(function(){
+                $(this).find("i.fa-caret-up").toggleClass("fa-rotate");
+                $(this).parent().next('.reports__task-container').slideToggle();
+            });
+        });
         let reportUrl = "{{ url('reports') }}/";
     </script>
     <script src="{{ mix('assets/js/report/report.js') }}"></script>
diff --git a/resources/views/tasks/show.blade.php b/resources/views/tasks/show.blade.php
index 5d1ef9441..df259d376 100644
--- a/resources/views/tasks/show.blade.php
+++ b/resources/views/tasks/show.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.app')
 @section('title')
-    Task Detail
+    Task Details
 @endsection
 @section('page_css')
     <link rel="stylesheet"
@@ -16,7 +16,7 @@
         <div class="animated fadeIn">
             @include('flash::message')
             <div class="page-header">
-                <h3>Task Detail</h3>
+                <h3>Task Details</h3>
                 <div class="filter-container__btn">
                     <button class="btn btn-primary edit-btn" type="button" data-id="{{$task->id}}"
                             data-loading-text="<span class='spinner-border spinner-border-sm'></span> Processing...">
diff --git a/resources/views/tasks/task_details.blade.php b/resources/views/tasks/task_details.blade.php
index 9d8ac1ba4..df02b3da9 100644
--- a/resources/views/tasks/task_details.blade.php
+++ b/resources/views/tasks/task_details.blade.php
@@ -8,9 +8,12 @@
             </div>
             <div class="modal-body task-detail__body">
                 @include('loader')
-                <div class="row no-gutters">
-                    <div class="col-4 offset-8 mb-2" id="user-drop-down-body">
-                        {!!Form::select('task_users',[],null,['id'=>'task_users','class'=>'form-control'])  !!}
+                <div class="row no-gutters time-entry-data">
+                    <div class="col-sm-12 mb-2 d-flex">
+                        <div class="col-sm-8 pl-0 pt-2" id="total-duration"></div>
+                        <div class="col-sm-4 mb-2 pr-0" id="user-drop-down-body">
+                            {!!Form::select('task_users',[],null,['id'=>'task_users','class'=>'form-control'])  !!}
+                        </div>
                     </div>
                     <table class="col-12 table table-responsive-sm table-striped table-bordered" id="taskDetailsTable">
                         <thead>
diff --git a/resources/views/time_entries/edit_modal.blade.php b/resources/views/time_entries/edit_modal.blade.php
index 52b62f5c2..df5024055 100644
--- a/resources/views/time_entries/edit_modal.blade.php
+++ b/resources/views/time_entries/edit_modal.blade.php
@@ -1,5 +1,5 @@
 <div id="editTimeEntryModal" class="modal fade" role="dialog">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <!-- Modal content-->
         <div class="modal-content">
             <div class="modal-header">
@@ -10,50 +10,46 @@
             <div class="modal-body">
                 <div class="alert alert-danger" style="display: none" id="teEditValidationErrorsBox"></div>
                 {!! Form::hidden('entry_id',null,['id'=>'entryId']) !!}
-                <div class="row">
-                    <div class="form-group col-sm-12">
+                <div class="form-group row">
+                    <div class="col-sm-4">
                         {!! Form::label('project', 'Project') !!}<span class="required">*</span>
                         {!! Form::select('project_id', $projects, null, ['id'=>'editTimeProjectId','class' => 'form-control','required', 'placeholder'=>'Select Project']) !!}
                     </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
+                    <div class="col-sm-8">
                         {!! Form::label('task', 'Task') !!}<span class="required">*</span>
                         {!! Form::select('task_id', $tasks, null, ['id'=>'editTaskId','class' => 'form-control','required','placeholder'=>'Select Task']) !!}
                     </div>
                 </div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
-                        {!! Form::label('Activity Type', 'Activity Type') !!}<span class="required">*</span>
-                        {!! Form::select('activity_type_id', $activityTypes, null, ['id'=>'editActivityTypeId','class' => 'form-control','required','placeholder'=>'Select Task']) !!}
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-sm-6">
+                <div class="form-group row">
+                    <div class="col-sm-4">
                         {!! Form::label('start_time', 'Start Time') !!}<span class="required">*</span>
                         <div id="dvEditStartTime">
                             {!! Form::text('start_time', null, ['class' => 'form-control','id'=>'editStartTime', 'autocomplete' => 'off', 'required']) !!}
                         </div>
                     </div>
-                    <div class="form-group col-sm-6">
-                        {!! Form::label('end_time', 'End Time') !!}<span class="required">*</span>
-                        <div id="dvEditEndTime">
-                            {!! Form::text('end_time', null, ['class' => 'form-control','id'=>'editEndTime', 'autocomplete' => 'off', 'required']) !!}
-                        </div>
+                    <div class="col-sm-8">
+                        {!! Form::label('Activity Type', 'Activity Type') !!}<span class="required">*</span>
+                        {!! Form::select('activity_type_id', $activityTypes, null, ['id'=>'editActivityTypeId','class' => 'form-control','required','placeholder'=>'Select Task']) !!}
                     </div>
                 </div>
                 <div class="row">
-                    <div class="form-group col-sm-12">
-                        {!! Form::label('duration', 'Duration (minutes)') !!}
-                        <div id="dvEditDuration">
-                            {!! Form::number('duration', null, ['class' => 'form-control','id' => 'editDuration', 'readonly']) !!}
+                    <div class="col-sm-4 p-0">
+                        <div class="form-group col-sm-12">
+                            {!! Form::label('end_time', 'End Time') !!}<span class="required">*</span>
+                            <div id="dvEditEndTime">
+                                {!! Form::text('end_time', null, ['class' => 'form-control','id'=>'editEndTime', 'autocomplete' => 'off', 'required']) !!}
+                            </div>
+                        </div>
+                        <div class="form-group col-sm-12">
+                            {!! Form::label('duration', 'Duration (minutes)') !!}
+                            <div id="dvEditDuration">
+                                {!! Form::number('duration', null, ['class' => 'form-control','id' => 'editDuration', 'readonly']) !!}
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
+                    <div class="form-group col-sm-8">
                         {!! Form::label('note', 'Note') !!}
-                        {!! Form::textarea('note', null, ['class' => 'form-control','id' => 'editNote', 'rows' => 5]) !!}
+                        {!! Form::textarea('note', null, ['class' => 'form-control','id' => 'editNote', 'rows' => 5, 'style'=>'line-height: 1.5;']) !!}
                     </div>
                 </div>
                 <div class="text-right">
diff --git a/resources/views/time_entries/modal.blade.php b/resources/views/time_entries/modal.blade.php
index 5729dd833..6019fc362 100644
--- a/resources/views/time_entries/modal.blade.php
+++ b/resources/views/time_entries/modal.blade.php
@@ -1,5 +1,5 @@
 <div id="timeEntryAddModal" class="modal fade" role="dialog">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-lg">
         <!-- Modal content-->
         <div class="modal-content">
             <div class="modal-header">
@@ -9,50 +9,46 @@
             {!! Form::open(['id'=>'timeEntryAddForm']) !!}
             <div class="modal-body">
                 <div class="alert alert-danger" style="display: none" id="tmValidationErrorsBox"></div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
+                <div class="form-group row">
+                    <div class="col-sm-4">
                         {!! Form::label('project', 'Project') !!}<span class="required">*</span>
                         {!! Form::select('project_id', $projects, null, ['id'=>'timeProjectId','class' => 'form-control','required', 'placeholder'=>'Select Project']) !!}
                     </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
+                    <div class="col-sm-8">
                         {!! Form::label('task', 'Task') !!}<span class="required">*</span>
                         {!! Form::select('task_id', [], null, ['id'=>'taskId','class' => 'form-control','required', 'placeholder'=>'Select Task']) !!}
                     </div>
                 </div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
-                        {!! Form::label('Activity Type', 'Activity Type') !!}<span class="required">*</span>
-                        {!! Form::select('activity_type_id', $activityTypes, null, ['id'=>'activityTypeId','class' => 'form-control','required', 'placeholder'=>'Select Activity']) !!}
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-sm-6">
+                <div class="form-group row">
+                    <div class="col-sm-4">
                         {!! Form::label('start_time', 'Start Time') !!}<span class="required">*</span>
                         <div id="dvStartTime">
                             {!! Form::text('start_time', null, ['class' => 'form-control','id'=>'startTime', 'autocomplete' => 'off','required']) !!}
                         </div>
                     </div>
-                    <div class="form-group col-sm-6">
-                        {!! Form::label('end_time', 'End Time') !!}<span class="required">*</span>
-                        <div id="dvEndTime">
-                            {!! Form::text('end_time', null, ['class' => 'form-control','id'=>'endTime', 'autocomplete' => 'off', 'required']) !!}
-                        </div>
+                    <div class="col-sm-8">
+                        {!! Form::label('Activity Type', 'Activity Type') !!}<span class="required">*</span>
+                        {!! Form::select('activity_type_id', $activityTypes, null, ['id'=>'activityTypeId','class' => 'form-control','required', 'placeholder'=>'Select Activity']) !!}
                     </div>
                 </div>
                 <div class="row">
-                    <div class="form-group col-sm-12">
-                        {!! Form::label('duration', 'Duration (minutes)') !!}
-                        <div id="dvDuration">
-                            {!! Form::number('duration', null, ['class' => 'form-control','id' => 'duration', 'readonly']) !!}
+                    <div class="col-sm-4 p-0">
+                        <div class="form-group col-sm-12">
+                            {!! Form::label('end_time', 'End Time') !!}<span class="required">*</span>
+                            <div id="dvEndTime">
+                                {!! Form::text('end_time', null, ['class' => 'form-control','id'=>'endTime', 'autocomplete' => 'off', 'required']) !!}
+                            </div>
+                        </div>
+                        <div class="form-group col-sm-12">
+                            {!! Form::label('duration', 'Duration (minutes)') !!}
+                            <div id="dvDuration">
+                                {!! Form::number('duration', null, ['class' => 'form-control','id' => 'duration', 'readonly']) !!}
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="form-group col-sm-12">
+                    <div class="form-group col-sm-8">
                         {!! Form::label('note', 'Note') !!}
-                        {!! Form::textarea('note', null, ['class' => 'form-control', 'rows' => 5]) !!}
+                        {!! Form::textarea('note', null, ['class' => 'form-control', 'rows' => 5, 'style'=>'line-height: 1.5;']) !!}
                         {!! Form::hidden('entry_type', 2) !!}
                     </div>
                 </div>
diff --git a/routes/web.php b/routes/web.php
index 85c0351c4..c5e0b0b00 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -45,13 +45,14 @@
     });
 
     Route::middleware('permission:manage_users')->group(function () {
-        Route::post('users/{user}/active-de-active', 'UserController@activeDeActiveUser');
+        Route::post('users/{user}/active-de-active', 'UserController@activeDeActiveUser')
+            ->name('active-de-active-user');
         Route::resource('users', 'UserController');
-        Route::get('users/{user}/send-email', 'UserController@resendEmailVerification');
+        Route::get('users/{user}/send-email', 'UserController@resendEmailVerification')->name('send-email');
     });
 
-    Route::get('users/{user}/edit', 'UserController@edit');
-    Route::post('users/profile-update', 'UserController@profileUpdate');
+    Route::get('users/{user}/edit', 'UserController@edit')->name('users.edit');
+    Route::post('users/profile-update', 'UserController@profileUpdate')->name('update-profile');
 
     Route::middleware('permission:manage_tags')->group(function () {
         Route::resource('tags', 'TagController');
@@ -69,8 +70,10 @@
             ->name('task.delete-attachment');
         Route::get('tasks/{task}/get-attachments', 'TaskController@getAttachment')->name('task.attachments');
         Route::post('tasks/{task}/comments', 'CommentController@addComment')->name('task.comments');
-        Route::post('tasks/{task}/comments/{comment}/update', 'CommentController@editComment')->name('task.update-comment');
-        Route::delete('tasks/{task}/comments/{comment}', 'CommentController@deleteComment')->name('task.delete-comment');
+        Route::post('tasks/{task}/comments/{comment}/update',
+            'CommentController@editComment')->name('task.update-comment');
+        Route::delete('tasks/{task}/comments/{comment}',
+            'CommentController@deleteComment')->name('task.delete-comment');
         Route::get('task-details/{task}', 'TaskController@getTaskDetails')->name('task.get-details');
         Route::get('tasks/{task}/comments-count', 'TaskController@getCommentsCount')->name('task.comments-count');
         Route::get('tasks/{task}/users', 'TaskController@getTaskUsers')->name('task.users');
@@ -78,18 +81,18 @@
 
     Route::resource('time-entries', 'TimeEntryController');
     Route::post('time-entries/{time_entry}/update', 'TimeEntryController@update');
-    Route::get('start-timer', 'TimeEntryController@getStartTimer');
+    Route::post('start-timer', 'TimeEntryController@getStartTimer');
 
     Route::middleware('permission:manage_reports')->group(function () {
         Route::resource('reports', 'ReportController');
-        Route::get('users-of-projects', 'ProjectController@users');
-        Route::get('projects-of-client', 'ClientController@projects');
+        Route::get('users-of-projects', 'ProjectController@users')->name('users-of-projects');
+        Route::get('projects-of-client', 'ClientController@projects')->name('projects-of-client');
     });
 
-    Route::get('my-tasks', 'TaskController@myTasks');
-    Route::get('user-last-task-work', 'TimeEntryController@getUserLastTask');
-    Route::get('projects/{project}/tasks', 'TimeEntryController@getTasks');
-    Route::get('my-projects', 'ProjectController@getMyProjects');
+    Route::get('my-tasks', 'TaskController@myTasks')->name('my-tasks');
+    Route::get('user-last-task-work', 'TimeEntryController@getUserLastTask')->name('user-last-task-work');
+    Route::get('projects/{project}/tasks', 'TimeEntryController@getTasks')->name('project-tasks');
+    Route::get('my-projects', 'ProjectController@getMyProjects')->name('my-projects');
 
     Route::middleware('permission:manage_roles')->group(function () {
         Route::resource('roles', 'RoleController');
diff --git a/tests/Controllers/ActivityTypeControllerTest.php b/tests/Controllers/ActivityTypeControllerTest.php
index b8dbbd416..71a4496ff 100644
--- a/tests/Controllers/ActivityTypeControllerTest.php
+++ b/tests/Controllers/ActivityTypeControllerTest.php
@@ -3,52 +3,31 @@
 namespace Tests\Controllers;
 
 use App\Models\ActivityType;
-use App\Repositories\ActivityTypeRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 class ActivityTypeControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $activityTypeRepository;
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
         parent::setUp();
-
         $this->signInWithDefaultAdminUser();
-
-        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
-    }
-
-    private function mockRepository()
-    {
-        $this->activityTypeRepository = \Mockery::mock(ActivityTypeRepository::class);
-        app()->instance(ActivityTypeRepository::class, $this->activityTypeRepository);
-    }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        \Mockery::close();
     }
 
     /** @test */
     public function it_can_store_activity_type()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$activityType);
 
         $activityType = factory(ActivityType::class)->raw();
 
-        $this->activityTypeRepository->shouldReceive('create')
-            ->once()
+        $this->activityTypeRepository->expects('create')
             ->with(array_merge($activityType, ['created_by' => getLoggedInUserId()]));
 
-        $response = $this->postJson('activity-types', $activityType);
+        $response = $this->postJson(route('activity-types.store'), $activityType);
 
         $this->assertSuccessMessageResponse($response, 'Activity Type created successfully.');
     }
@@ -59,27 +38,29 @@ public function it_can_retrieve_activity_type()
         /** @var ActivityType $activityType */
         $activityType = factory(ActivityType::class)->create();
 
-        $response = $this->getJson('activity-types/'.$activityType->id.'/edit');
+        $response = $this->getJson(route('activity-types.edit', $activityType->id));
 
-        $this->assertSuccessDataResponse($response, $activityType->toArray(), 'Activity Type retrieved successfully.');
+        $this->assertSuccessDataResponse(
+            $response,
+            $activityType->toArray(),
+            'Activity Type retrieved successfully.'
+        );
     }
 
     /** @test */
     public function it_can_update_activity_type()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$activityType);
 
         /** @var ActivityType $activityType */
         $activityType = factory(ActivityType::class)->create();
 
-        $this->activityTypeRepository->shouldReceive('update')
-            ->once()
+        $this->activityTypeRepository->expects('update')
             ->withArgs([['name' => 'Dummy Name'], $activityType->id]);
 
-        $response = $this->putJson(
-            'activity-types/'.$activityType->id,
-            ['name' => 'Dummy Name']
-        );
+        $response = $this->putJson(route('activity-types.update', $activityType->id), [
+            'name' => 'Dummy Name',
+        ]);
 
         $this->assertSuccessMessageResponse($response, 'Activity Type updated successfully.');
     }
@@ -90,7 +71,7 @@ public function it_can_delete_activity_type()
         /** @var ActivityType $activityType */
         $activityType = factory(ActivityType::class)->create();
 
-        $response = $this->deleteJson('activity-types/'.$activityType->id);
+        $response = $this->deleteJson(route('activity-types.destroy', $activityType->id));
 
         $this->assertSuccessMessageResponse($response, 'Activity Type deleted successfully.');
 
diff --git a/tests/Controllers/Auth/LoginControllerTest.php b/tests/Controllers/Auth/LoginControllerTest.php
new file mode 100644
index 000000000..f1e21030c
--- /dev/null
+++ b/tests/Controllers/Auth/LoginControllerTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Tests\Controllers\Auth;
+
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class LoginControllerTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function test_it_shows_login_form()
+    {
+        $response = $this->get(route('login'));
+
+        $response->assertStatus(200)
+            ->assertViewIs('auth.login')
+            ->assertSeeText('Login')
+            ->assertSeeText('Sign In to your account')
+            ->assertSeeText('Forgot password?');
+    }
+
+    /** @test */
+    public function test_it_shows_password_reset_form()
+    {
+        $response = $this->get(route('password.request'));
+
+        $response->assertStatus(200)
+            ->assertViewIs('auth.passwords.email')
+            ->assertSeeText('Reset Your Password')
+            ->assertSeeText('Enter Email to reset password');
+    }
+}
diff --git a/tests/Controllers/ClientControllerTest.php b/tests/Controllers/ClientControllerTest.php
index 256119b48..781ddc4cf 100644
--- a/tests/Controllers/ClientControllerTest.php
+++ b/tests/Controllers/ClientControllerTest.php
@@ -11,64 +11,42 @@
 
 use App\Models\Client;
 use App\Models\Project;
-use App\Repositories\ClientRepository;
-use App\Repositories\ProjectRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 /**
  * Class ClientControllerTest.
  */
 class ClientControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $clientRepository;
-
-    /** @var MockInterface */
-    protected $projectRepository;
-
-    protected $defaultUserId = 1;
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
         parent::setUp();
-
         $this->signInWithDefaultAdminUser();
-
-        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
-    }
-
-    public function mockClientRepository()
-    {
-        $this->clientRepository = \Mockery::mock(ClientRepository::class);
-        app()->instance(ClientRepository::class, $this->clientRepository);
-    }
-
-    public function mockProjectRepository()
-    {
-        $this->projectRepository = \Mockery::mock(ProjectRepository::class);
-        app()->instance(ProjectRepository::class, $this->projectRepository);
     }
 
-    public function tearDown(): void
+    /** @test */
+    public function it_shows_clients()
     {
-        parent::tearDown();
+        $response = $this->getJson(route('clients.index'));
 
-        \Mockery::close();
+        $response->assertStatus(200)
+            ->assertViewIs('clients.index')
+            ->assertSeeText('Clients')
+            ->assertSeeText('New Client');
     }
 
     /** @test */
     public function it_can_store_client()
     {
-        $this->mockClientRepository();
+        $this->mockRepo(self::$client);
 
         $client = factory(Client::class)->raw();
 
-        $this->clientRepository->shouldReceive('create')
-            ->once()
+        $this->clientRepository->expects('create')
             ->with(array_merge($client, ['created_by' => $this->loggedInUserId]));
 
         $response = $this->postJson('clients', $client);
@@ -79,9 +57,10 @@ public function it_can_store_client()
     /** @test */
     public function it_can_retrieve_client()
     {
+        /** @var Client $client */
         $client = factory(Client::class)->create();
 
-        $response = $this->getJson('clients/'.$client->id.'/edit');
+        $response = $this->getJson(route('clients.edit', $client->id));
 
         $this->assertSuccessDataResponse($response, $client->toArray(), 'Client retrieved successfully.');
     }
@@ -89,19 +68,14 @@ public function it_can_retrieve_client()
     /** @test */
     public function it_can_update_client()
     {
-        $this->mockClientRepository();
+        $this->mockRepo(self::$client);
 
         $client = factory(Client::class)->create();
         $fakeClient = factory(Client::class)->raw();
 
-        $this->clientRepository->shouldReceive('update')
-            ->once()
-            ->withArgs([$fakeClient, $client->id]);
+        $this->clientRepository->expects('update')->withArgs([$fakeClient, $client->id]);
 
-        $response = $this->putJson(
-            'clients/'.$client->id,
-            $fakeClient
-        );
+        $response = $this->putJson(route('clients.update', $client->id), $fakeClient);
 
         $this->assertSuccessMessageResponse($response, 'Client updated successfully.');
     }
@@ -109,13 +83,14 @@ public function it_can_update_client()
     /** @test */
     public function it_can_delete_client()
     {
+        /** @var Client $client */
         $client = factory(Client::class)->create();
 
-        $response = $this->deleteJson('clients/'.$client->id);
+        $response = $this->deleteJson(route('clients.destroy', $client->id));
 
         $this->assertSuccessMessageResponse($response, 'Client deleted successfully.');
 
-        $response = $this->getJson('clients/'.$client->id.'/edit');
+        $response = $this->getJson(route('clients.edit', $client->id));
 
         $response->assertStatus(404);
         $response->assertJson([
@@ -127,7 +102,7 @@ public function it_can_delete_client()
     /** @test */
     public function test_can_retrieve_projects_of_given_client()
     {
-        $this->mockProjectRepository();
+        $this->mockRepo(self::$project);
 
         /** @var Client $client */
         $client = factory(Client::class)->create();
@@ -137,12 +112,11 @@ public function test_can_retrieve_projects_of_given_client()
 
         $mockResponse = ['id' => $project->id, 'name' => $project->name];
 
-        $this->projectRepository->shouldReceive('getProjectsList')
-            ->once()
+        $this->projectRepository->expects('getProjectsList')
             ->with($client->id)
             ->andReturn($mockResponse);
 
-        $response = $this->getJson("projects-of-client?client_id=$client->id");
+        $response = $this->getJson(route('projects-of-client', ['client_id' => $client->id]));
 
         $this->assertSuccessDataResponse($response, $mockResponse, 'Projects retrieved successfully.');
     }
diff --git a/tests/Controllers/CommentControllerTest.php b/tests/Controllers/CommentControllerTest.php
index 413d70d0d..a0a43b622 100644
--- a/tests/Controllers/CommentControllerTest.php
+++ b/tests/Controllers/CommentControllerTest.php
@@ -3,54 +3,35 @@
 namespace Tests\Controllers;
 
 use App\Models\Comment;
-use App\Repositories\TaskRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 class CommentControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $taskRepository;
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-        \Mockery::close();
-    }
-
-    private function mockRepository()
-    {
-        $this->taskRepository = \Mockery::mock(TaskRepository::class);
-        app()->instance(TaskRepository::class, $this->taskRepository);
-    }
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->signInWithDefaultAdminUser();
-        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
     }
 
     /** @test */
     public function test_can_add_comment()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$task);
 
         $comment = factory(Comment::class)->make();
 
-        $this->taskRepository->shouldReceive('addComment')
-            ->once()
+        $this->taskRepository->expects('addComment')
             ->with(['comment' => $comment->comment, 'task_id' => $comment->task_id])
             ->andReturn($comment);
 
-        $this->taskRepository->shouldReceive('addCommentBroadCast')
-            ->once()
+        $this->taskRepository->expects('addCommentBroadCast')
             ->with($comment);
 
-        $response = $this->postJson("tasks/{$comment->task_id}/comments", [
+        $response = $this->postJson(route('task.comments', $comment->task_id), [
             'comment' => $comment->comment,
         ]);
 
@@ -60,15 +41,17 @@ public function test_can_add_comment()
     /** @test */
     public function test_can_update_comment_with_valid_input()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$task);
 
+        /** @var Comment $comment */
         $comment = factory(Comment::class)->create(['created_by' => $this->loggedInUserId]);
         $newText = $this->faker->text;
 
-        $this->taskRepository->shouldReceive('editCommentBroadCast')
-            ->once();
+        $this->taskRepository->expects('editCommentBroadCast');
 
-        $result = $this->post('tasks/'.$comment->task_id.'/comments/'.$comment->id.'/update', ['comment' => $newText]);
+        $result = $this->postJson(route('task.update-comment', [$comment->task_id, $comment->id]), [
+            'comment' => $newText,
+        ]);
 
         $this->assertSuccessMessageResponse($result, 'Comment has been updated successfully.');
         $this->assertEquals($newText, $comment->fresh()->comment);
@@ -77,14 +60,14 @@ public function test_can_update_comment_with_valid_input()
     /** @test */
     public function test_can_delete_given_comment()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$task);
 
+        /** @var Comment $comment */
         $comment = factory(Comment::class)->create(['created_by' => $this->loggedInUserId]);
 
-        $this->taskRepository->shouldReceive('deleteCommentBroadCast')
-            ->once();
+        $this->taskRepository->expects('deleteCommentBroadCast');
 
-        $result = $this->delete('tasks/'.$comment->task_id.'/comments/'.$comment->id);
+        $result = $this->delete(route('task.delete-comment', [$comment->task_id, $comment->id]));
 
         $this->assertSuccessMessageResponse($result, 'Comment has been deleted successfully.');
         $this->assertEmpty(Comment::find($comment->id));
diff --git a/tests/Controllers/HomeControllerTest.php b/tests/Controllers/HomeControllerTest.php
index 7a5a56f76..6546139cb 100644
--- a/tests/Controllers/HomeControllerTest.php
+++ b/tests/Controllers/HomeControllerTest.php
@@ -3,41 +3,43 @@
 namespace Tests\Controllers;
 
 use App\Models\TimeEntry;
-use App\Repositories\DashboardRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 class HomeControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $dashboardRepository;
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->signInWithDefaultAdminUser();
-        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
     }
 
-    private function mockRepository()
+    /** @test */
+    public function it_shows_dashboard()
     {
-        $this->dashboardRepository = \Mockery::mock(DashboardRepository::class);
-        app()->instance(DashboardRepository::class, $this->dashboardRepository);
-    }
+        $this->mockRepo(self::$user);
 
-    public function tearDown(): void
-    {
-        parent::tearDown();
-        \Mockery::close();
+        $mockedResponse = [['id' => 1, 'name' => 'Dummy User']];
+        $this->userRepository->expects('getUserList')
+            ->andReturn($mockedResponse);
+
+        $response = $this->get(route('home'));
+
+        $response->assertStatus(200)
+            ->assertViewIs('dashboard.index')
+            ->assertViewHas('users', $mockedResponse)
+            ->assertSeeText('Dashboard')
+            ->assertSeeText('Custom Report')
+            ->assertSeeText('Daily Work Report');
     }
 
     /** @test */
     public function test_can_retrieve_report_of_given_user()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$dashboard);
 
         /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create();
@@ -47,14 +49,18 @@ public function test_can_retrieve_report_of_given_user()
         $userId = $timeEntry->user_id;
 
         $mockResponse = ['projects' => [$timeEntry->task->project->name]];
-        $this->dashboardRepository->shouldReceive('getWorkReport')->once()
+        $this->dashboardRepository->expects('getWorkReport')
             ->with([
                 'start_date' => $startTime,
                 'end_date'   => $endTime,
                 'user_id'    => $userId,
             ])->andReturn($mockResponse);
 
-        $response = $this->getJson("/users-work-report?start_date=$startTime&end_date=$endTime&user_id=$userId");
+        $response = $this->getJson(route('users-work-report', [
+            'start_date' => $startTime,
+            'end_date'   => $endTime,
+            'user_id'    => $userId,
+        ]));
 
         $this->assertSuccessDataResponse($response, $mockResponse, 'Custom Report retrieved successfully.');
     }
@@ -62,7 +68,7 @@ public function test_can_retrieve_report_of_given_user()
     /** @test */
     public function test_can_retrieve_developer_work_report()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$dashboard);
 
         /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create();
@@ -71,15 +77,21 @@ public function test_can_retrieve_developer_work_report()
         $endTime = $timeEntry->end_time;
 
         $mockResponse = ['projects' => [$timeEntry->task->project->name]];
-        $this->dashboardRepository->shouldReceive('getDeveloperWorkReport')
-            ->once()
+        $this->dashboardRepository->expects('getDeveloperWorkReport')
             ->with([
                 'start_date' => $startTime,
                 'end_date'   => $endTime,
             ])->andReturn($mockResponse);
 
-        $response = $this->getJson("/developer-work-report?start_date=$startTime&end_date=$endTime");
+        $response = $this->getJson(route('developers-work-report', [
+            'start_date' => $startTime,
+            'end_date'   => $endTime,
+        ]));
 
-        $this->assertSuccessDataResponse($response, $mockResponse, 'Daily Work Report retrieved successfully.');
+        $this->assertSuccessDataResponse(
+            $response,
+            $mockResponse,
+            'Daily Work Report retrieved successfully.'
+        );
     }
 }
diff --git a/tests/Controllers/ProjectControllerTest.php b/tests/Controllers/ProjectControllerTest.php
index 11b5f065a..b392af3ce 100644
--- a/tests/Controllers/ProjectControllerTest.php
+++ b/tests/Controllers/ProjectControllerTest.php
@@ -4,41 +4,60 @@
 
 use App\Models\Project;
 use App\Models\User;
-use App\Repositories\ProjectRepository;
-use App\Repositories\UserRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 class ProjectControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $projectRepository;
-
-    /** @var MockInterface */
-    protected $userRepo;
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->signInWithDefaultAdminUser();
-        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
     }
 
-    private function mockRepository()
+    /** @test */
+    public function it_can_shows_projects()
     {
-        $this->projectRepository = \Mockery::mock(ProjectRepository::class);
-        $this->userRepo = \Mockery::mock(UserRepository::class);
-        app()->instance(ProjectRepository::class, $this->projectRepository);
-        app()->instance(UserRepository::class, $this->userRepo);
+        $this->mockRepo([self::$client, self::$user]);
+
+        $mockClientResponse = [['id' => 1, 'name' => 'Dummy Client']];
+        $this->clientRepository->expects('getClientList')
+            ->andReturn($mockClientResponse);
+
+        $mockUserResponse = [['id' => 1, 'name' => 'Dummy User']];
+        $this->userRepository->expects('getUserList')
+            ->andReturn($mockUserResponse);
+
+        $response = $this->get(route('projects.index'));
+
+        $response->assertStatus(200)
+            ->assertViewIs('projects.index')
+            ->assertSeeText('Projects')
+            ->assertSeeText('New Project')
+            ->assertViewHasAll(['clients' => $mockClientResponse, 'users' => $mockUserResponse]);
     }
 
-    public function tearDown(): void
+    /** @test */
+    public function test_can_filter_projects_by_client()
     {
-        parent::tearDown();
-        \Mockery::close();
+        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
+
+        /** @var Project $firstProject */
+        $firstProject = factory(Project::class)->create();
+        /** @var Project $secondProject */
+        $secondProject = factory(Project::class)->create();
+
+        $response = $this->getJson(route('projects.index', [
+            'filter_client' => $firstProject->client_id,
+        ]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($firstProject->id, $data[0]['id']);
+        $this->assertEquals($firstProject->client_id, $data[0]['client']['id']);
     }
 
     /** @test */
@@ -50,13 +69,12 @@ public function it_can_retrieve_project()
         $project = factory(Project::class)->create();
         $project->users()->sync([$user->id]);
 
-        $response = $this->getJson('projects/'.$project->id.'/edit');
+        $response = $this->getJson(route('projects.edit', $project->id));
 
-        $this->assertSuccessDataResponse($response,
-            [
-                'project' => $project->toArray(),
-                'users'   => [$user->id],
-            ],
+        $this->assertSuccessDataResponse($response, [
+            'project' => $project->toArray(),
+            'users'   => [$user->id],
+        ],
             'Project retrieved successfully.'
         );
     }
@@ -67,11 +85,11 @@ public function test_can_delete_project()
         /** @var Project $project */
         $project = factory(Project::class)->create();
 
-        $response = $this->deleteJson('projects/'.$project->id);
+        $response = $this->deleteJson(route('projects.destroy', $project->id));
 
         $this->assertSuccessMessageResponse($response, 'Project deleted successfully.');
 
-        $response = $this->getJson('projects/'.$project->id.'/edit');
+        $response = $this->getJson(route('projects.edit', $project->id));
 
         $response->assertStatus(404);
         $response->assertJson([
@@ -83,16 +101,14 @@ public function test_can_delete_project()
     /** @test */
     public function test_can_get_projects_of_logged_in_user()
     {
-        $this->mockRepository();
+        $this->mockRepo([self::$project]);
 
         /** @var Project $project */
         $project = factory(Project::class)->create();
 
-        $this->projectRepository->shouldReceive('getMyProjects')
-            ->once()
-            ->andReturn($project->toArray());
+        $this->projectRepository->expects('getMyProjects')->andReturn($project->toArray());
 
-        $response = $this->getJson('my-projects');
+        $response = $this->getJson(route('my-projects'));
 
         $this->assertSuccessDataResponse($response, $project->toArray(), 'Project Retrieved successfully.');
     }
@@ -100,7 +116,7 @@ public function test_can_get_projects_of_logged_in_user()
     /** @test */
     public function test_get_can_users_of_given_project_ids()
     {
-        $this->mockRepository();
+        $this->mockRepo([self::$user]);
 
         /** @var User $farhan */
         $farhan = factory(User::class)->create();
@@ -111,12 +127,11 @@ public function test_get_can_users_of_given_project_ids()
 
         $mockResponse = [$farhan->id => $farhan->name];
 
-        $this->userRepo->shouldReceive('getUserList')
-            ->once()
+        $this->userRepository->expects('getUserList')
             ->with([$project->id])
             ->andReturn($mockResponse);
 
-        $response = $this->getJson('users-of-projects?projectIds='.$project->id);
+        $response = $this->getJson(route('users-of-projects', ['projectIds' => $project->id]));
 
         $this->assertSuccessDataResponse($response, $mockResponse, 'Users Retrieved successfully.');
     }
diff --git a/tests/Controllers/ReportControllerTest.php b/tests/Controllers/ReportControllerTest.php
new file mode 100644
index 000000000..cbd0d7ffc
--- /dev/null
+++ b/tests/Controllers/ReportControllerTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\Controllers;
+
+use App\Models\Report;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class ReportControllerTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->signInWithDefaultAdminUser();
+        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
+    }
+
+    /** @test */
+    public function test_reports_are_filtered_using_created_by()
+    {
+        /** @var Report $firstReport */
+        $firstReport = factory(Report::class)->create();
+        $secondReport = factory(Report::class)->create();
+
+        $response = $this->getJson(route('reports.index', [
+            'filter_created_by' => $firstReport->owner_id,
+        ]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($firstReport->id, $data[0]['id']);
+        $this->assertEquals($firstReport->owner_id, $data[0]['owner_id']);
+    }
+}
diff --git a/tests/Controllers/RoleControllerTest.php b/tests/Controllers/RoleControllerTest.php
index 067ee3ea1..b5ef8365a 100644
--- a/tests/Controllers/RoleControllerTest.php
+++ b/tests/Controllers/RoleControllerTest.php
@@ -27,7 +27,7 @@ public function it_can_delete_role()
 
         $this->assertSuccessMessageResponse($response, 'Role deleted successfully.');
 
-        $response = $this->getJson('roles/'.$role->id.'/edit');
+        $response = $this->getJson(route('roles.edit', $role->id));
 
         $response->assertStatus(404);
         $response->assertJson([
@@ -44,7 +44,7 @@ public function it_can_not_delete_role_when_role_assigned_to_user()
         $farhan = factory(User::class)->create();
         $role->users()->sync([$farhan->id]);
 
-        $response = $this->deleteJson('roles/'.$role->id);
+        $response = $this->deleteJson(route('roles.destroy', $role->id));
 
         $response->assertStatus(400);
         $response->assertJson([
diff --git a/tests/Controllers/TagControllerTest.php b/tests/Controllers/TagControllerTest.php
index f169cf459..2d6fe473a 100644
--- a/tests/Controllers/TagControllerTest.php
+++ b/tests/Controllers/TagControllerTest.php
@@ -3,49 +3,30 @@
 namespace Tests\Controllers;
 
 use App\Models\Tag;
-use App\Repositories\TagRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 class TagControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $tagRepository;
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->signInWithDefaultAdminUser();
-        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
-    }
-
-    private function mockRepository()
-    {
-        $this->tagRepository = \Mockery::mock(TagRepository::class);
-        app()->instance(TagRepository::class, $this->tagRepository);
-    }
-
-    public function tearDown(): void
-    {
-        parent::tearDown();
-        \Mockery::close();
     }
 
     /** @test */
     public function it_can_store_tag()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$tag);
 
         $tag = factory(Tag::class)->raw();
 
-        $this->tagRepository->shouldReceive('store')
-            ->once()
-            ->with($tag);
+        $this->tagRepository->expects('store')->with($tag);
 
-        $response = $this->postJson('tags', $tag);
+        $response = $this->postJson(route('tags.store'), $tag);
 
         $this->assertSuccessMessageResponse($response, 'Tag created successfully.');
     }
@@ -56,7 +37,7 @@ public function it_can_retrieve_tag()
         /** @var Tag $tag */
         $tag = factory(Tag::class)->create();
 
-        $response = $this->getJson('tags/'.$tag->id.'/edit');
+        $response = $this->getJson(route('tags.edit', $tag->id));
 
         $this->assertSuccessDataResponse($response, $tag->toArray(), 'Tag retrieved successfully.');
     }
@@ -64,19 +45,16 @@ public function it_can_retrieve_tag()
     /** @test */
     public function it_can_update_tag()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$tag);
 
         /** @var Tag $tag */
         $tag = factory(Tag::class)->create();
 
-        $this->tagRepository->shouldReceive('update')
-            ->once()
-            ->withArgs([['name' => 'Dummy Tag'], $tag->id]);
+        $this->tagRepository->expects('update')->withArgs([['name' => 'Dummy Tag'], $tag->id]);
 
-        $response = $this->putJson(
-            'tags/'.$tag->id,
-            ['name' => 'Dummy Tag']
-        );
+        $response = $this->putJson(route('tags.update', $tag->id), [
+            'name' => 'Dummy Tag',
+        ]);
 
         $this->assertSuccessMessageResponse($response, 'Tag updated successfully.');
     }
@@ -87,11 +65,11 @@ public function it_can_delete_tag()
         /** @var Tag $tag */
         $tag = factory(Tag::class)->create();
 
-        $response = $this->deleteJson('tags/'.$tag->id);
+        $response = $this->deleteJson(route('tags.destroy', $tag->id));
 
         $this->assertSuccessMessageResponse($response, 'Tag deleted successfully.');
 
-        $response = $this->getJson('tags/'.$tag->id.'/edit');
+        $response = $this->getJson(route('tags.edit', $tag->id));
 
         $response->assertStatus(404);
         $response->assertJson([
diff --git a/tests/Controllers/TaskControllerTest.php b/tests/Controllers/TaskControllerTest.php
index 138605eeb..2a54055e8 100644
--- a/tests/Controllers/TaskControllerTest.php
+++ b/tests/Controllers/TaskControllerTest.php
@@ -3,24 +3,21 @@
 namespace Tests\Controllers;
 
 use App\Models\Comment;
+use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Models\TimeEntry;
 use App\Models\User;
-use App\Repositories\TaskRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 /**
  * Class TaskControllerTest.
  */
 class TaskControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $taskRepository;
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
@@ -29,16 +26,107 @@ public function setUp(): void
         $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
     }
 
-    private function mockRepository()
+    /** @test */
+    public function test_can_filter_tasks_by_task_status()
+    {
+        /** @var Project $project */
+        $project = factory(Project::class)->create();
+        $project->users()->sync([$this->loggedInUserId]);
+
+        /** @var Task $activeTask */
+        $activeTask = factory(Task::class)->create([
+            'status'     => Task::STATUS_ACTIVE,
+            'project_id' => $project->id,
+        ]);
+        /** @var Task $completedTask */
+        $completedTask = factory(Task::class)->create([
+            'status'     => Task::STATUS_COMPLETED,
+            'project_id' => $project->id,
+        ]);
+
+        $response = $this->getJson(route('tasks.index', ['filter_status' => Task::STATUS_ACTIVE]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($activeTask->id, $data[0]['id']);
+        $this->assertEquals(Task::STATUS_ACTIVE, $data[0]['status']);
+    }
+
+    /** @test */
+    public function test_can_filter_tasks_by_project()
     {
-        $this->taskRepository = \Mockery::mock(TaskRepository::class);
-        app()->instance(TaskRepository::class, $this->taskRepository);
+        /** @var Project $firstProject */
+        $firstProject = factory(Project::class)->create();
+        $firstProject->users()->sync([$this->loggedInUserId]);
+
+        /** @var Project $secondProject */
+        $secondProject = factory(Project::class)->create();
+        $secondProject->users()->sync([$this->loggedInUserId]);
+
+        /** @var Task $firstTask */
+        $firstTask = factory(Task::class)->create(['project_id' => $firstProject->id]);
+        /** @var Task $secondTask */
+        $secondTask = factory(Task::class)->create(['project_id' => $secondProject->id]);
+
+        $response = $this->getJson(route('tasks.index', ['filter_project' => $firstProject->id]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($firstTask->id, $data[0]['id']);
+        $this->assertEquals($firstTask->project_id, $data[0]['project']['id']);
+    }
+
+    /** @test */
+    public function test_can_filter_tasks_by_user()
+    {
+        $user = factory(User::class)->create();
+
+        /** @var Project $firstProject */
+        $firstProject = factory(Project::class)->create();
+        $firstProject->users()->sync([$this->loggedInUserId]);
+
+        /** @var Project $secondProject */
+        $secondProject = factory(Project::class)->create();
+        $secondProject->users()->sync([$user->id]);
+
+        /** @var Task $firstTask */
+        $firstTask = factory(Task::class)->create(['project_id' => $firstProject->id]);
+        $firstTask->taskAssignee()->sync([$this->loggedInUserId]);
+
+        /** @var Task $secondTask */
+        $secondTask = factory(Task::class)->create(['project_id' => $secondProject->id]);
+        $secondTask->taskAssignee()->sync([$user->id]);
+
+        $response = $this->getJson(route('tasks.index', ['filter_user' => $this->loggedInUserId]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($firstTask->id, $data[0]['id']);
+        $this->assertEquals($this->loggedInUserId, $data[0]['task_assignee'][0]['id']);
     }
 
-    public function tearDown(): void
+    /** @test */
+    public function test_can_filter_tasks_by_due_date()
     {
-        parent::tearDown();
-        \Mockery::close();
+        /** @var Project $project */
+        $project = factory(Project::class)->create();
+        $project->users()->sync([$this->loggedInUserId]);
+
+        $dueDate = date('Y-m-d H:i:s');
+        /** @var Task $firstTask */
+        $firstTask = factory(Task::class)->create([
+            'project_id' => $project->id,
+            'due_date'   => $dueDate,
+        ]);
+        /** @var Task $secondTask */
+        $secondTask = factory(Task::class)->create(['project_id' => $project->id]);
+
+        $response = $this->getJson(route('tasks.index', ['due_date_filter' => $dueDate]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($firstTask->id, $data[0]['id']);
+        $this->assertEquals($firstTask->due_date, $data[0]['due_date']);
     }
 
     /** @test */
@@ -55,18 +143,14 @@ public function test_can_retrieve_task()
         $tag = factory(Tag::class)->create();
         $task->tags()->sync([$tag->id]);
 
-        $response = $this->getJson('tasks/'.$task->id.'/edit');
+        $response = $this->getJson(route('tasks.edit', $task->id));
 
         $this->assertSuccessDataResponse($response, $task->toArray(), 'Task retrieved successfully.');
 
         $data = $response->original['data'];
-        $projectId = $data['project']['id'];
-        $tagId = $data['tags'][0]['id'];
-        $taskAssigneeId = $data['taskAssignee'][0]['id'];
-
-        $this->assertEquals($task->project_id, $projectId);
-        $this->assertEquals($tag->id, $tagId);
-        $this->assertEquals($farhan->id, $taskAssigneeId);
+        $this->assertEquals($task->project_id, $data['project']['id']);
+        $this->assertEquals($tag->id, $data['tags'][0]['id']);
+        $this->assertEquals($farhan->id, $data['taskAssignee'][0]['id']);
     }
 
     /** @test */
@@ -75,11 +159,11 @@ public function test_can_delete_task()
         /** @var Task $task */
         $task = factory(Task::class)->create();
 
-        $response = $this->deleteJson('tasks/'.$task->id);
+        $response = $this->deleteJson(route('tasks.destroy', $task->id));
 
         $this->assertSuccessMessageResponse($response, 'Task deleted successfully.');
 
-        $response = $this->getJson('tasks/'.$task->id.'/edit');
+        $response = $this->getJson(route('tasks.edit', $task->id));
 
         $response->assertStatus(404);
         $response->assertJson([
@@ -94,7 +178,7 @@ public function test_can_not_delete_task_when_task_has_one_or_more_time_entries(
         /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create();
 
-        $response = $this->deleteJson('tasks/'.$timeEntry->task_id);
+        $response = $this->deleteJson(route('tasks.destroy', $timeEntry->task_id));
 
         $response->assertJson([
             'success' => false,
@@ -105,17 +189,14 @@ public function test_can_not_delete_task_when_task_has_one_or_more_time_entries(
     /** @test */
     public function test_can_update_status_of_task()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$task);
 
         /** @var Task $task */
         $task = factory(Task::class)->create();
 
-        $this->taskRepository->shouldReceive('updateStatus')
-            ->once()
-            ->with($task->id);
-
-        $response = $this->postJson("tasks/$task->id/update-status");
+        $this->taskRepository->expects('updateStatus')->with($task->id);
 
+        $response = $this->postJson(route('task.update-status', $task->id), []);
         $response->assertJson([
             'success' => true,
             'message' => 'Task status Update successfully.',
@@ -125,36 +206,56 @@ public function test_can_update_status_of_task()
     /** @test */
     public function test_can_get_task_details()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$task);
 
         /** @var Task $task */
         $task = factory(Task::class)->create();
 
-        $this->taskRepository->shouldReceive('getTaskDetails')
-            ->once()
+        $this->taskRepository->expects('getTaskDetails')
             ->with($task->id, [])
             ->andReturn($task->toArray());
 
-        $response = $this->getJson("task-details/$task->id");
+        $response = $this->getJson(route('task.get-details', $task->id));
 
         $this->assertExactResponseData($response, $task->toArray(), 'Task retrieved successfully.');
     }
 
+    /** @test */
+    public function test_can_get_sum_of_total_duration_on_given_task_for_specific_user()
+    {
+        $this->mockRepo(self::$task);
+
+        /** @var TimeEntry $firstEntry */
+        $firstEntry = factory(TimeEntry::class)->create();
+        /** @var TimeEntry $secondEntry */
+        $secondEntry = factory(TimeEntry::class)->create();
+
+        $totalDuration = '00 Hours and 40 Minutes';
+        $mockTaskResponse = array_merge($firstEntry->task->toArray(), ['totalDuration' => $totalDuration]);
+        $this->taskRepository->expects('getTaskDetails')
+            ->with($firstEntry->task_id, ['user_id' => $firstEntry->user_id])
+            ->andReturn($mockTaskResponse);
+
+        $response = $this->getJson("task-details/$firstEntry->task_id?user_id=$firstEntry->user_id");
+
+        $this->assertExactResponseData($response, $mockTaskResponse, 'Task retrieved successfully.');
+        $this->assertEquals($totalDuration, $response->original['data']['totalDuration']);
+    }
+
     /** @test */
     public function test_can_get_task_of_logged_in_user_for_given_project()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$task);
 
         /** @var Task $task */
         $task = factory(Task::class)->create();
 
         $mockResponse = ['tasks' => ['id' => $task->id, 'title' => $task->title]];
-        $this->taskRepository->shouldReceive('myTasks')
-            ->once()
+        $this->taskRepository->expects('myTasks')
             ->with(['project_id' => $task->project_id])
             ->andReturn($mockResponse);
 
-        $response = $this->getJson("my-tasks?project_id=$task->project_id");
+        $response = $this->getJson(route('my-tasks', ['project_id' => $task->project_id]));
 
         $this->assertExactResponseData($response, $mockResponse, 'My tasks retrieved successfully.');
     }
@@ -165,7 +266,7 @@ public function test_can_get_count_of_comments_for_given_task()
         /** @var Comment $comment */
         $comment = factory(Comment::class)->create();
 
-        $response = $this->getJson("tasks/{$comment->task_id}/comments-count");
+        $response = $this->getJson(route('task.comments-count', $comment->task_id));
 
         $response->assertJson([
             'success' => true,
@@ -173,4 +274,21 @@ public function test_can_get_count_of_comments_for_given_task()
             'message' => 'Comments count retrieved successfully.',
         ]);
     }
+
+    /** @test */
+    public function test_can_get_assignee_of_given_task()
+    {
+        /** @var Task $task */
+        $task = factory(Task::class)->create();
+
+        /** @var User $farhan */
+        $farhan = factory(User::class)->create();
+        $task->taskAssignee()->sync([$farhan->id]);
+
+        $response = $this->getJson("tasks/{$task->id}/users");
+
+        $response = $response->original;
+        $this->assertContains($farhan->id, array_keys($response));
+        $this->assertContains($farhan->name, $response);
+    }
 }
diff --git a/tests/Controllers/TimeEntryControllerTest.php b/tests/Controllers/TimeEntryControllerTest.php
index 36b91b4fd..3b0aab799 100644
--- a/tests/Controllers/TimeEntryControllerTest.php
+++ b/tests/Controllers/TimeEntryControllerTest.php
@@ -4,54 +4,102 @@
 
 use App\Models\Task;
 use App\Models\TimeEntry;
-use App\Repositories\TimeEntryRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 class TimeEntryControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $timeEntryRepository;
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->signInWithDefaultAdminUser();
+    }
+
+    /** @test */
+    public function test_can_filter_time_entries_by_activity_type()
+    {
         $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
+
+        /** @var TimeEntry $firstTimeEntry */
+        $firstTimeEntry = factory(TimeEntry::class)->create();
+        /** @var TimeEntry $secondTimeEntry */
+        $secondTimeEntry = factory(TimeEntry::class)->create();
+
+        $response = $this->getJson(route('time-entries.index', [
+            'filter_activity' => $firstTimeEntry->activity_type_id,
+        ]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($firstTimeEntry->id, $data[0]['id']);
+        $this->assertEquals($firstTimeEntry->activity_type_id, $data[0]['activity_type']['id']);
     }
 
-    private function mockRepository()
+    /** @test */
+    public function test_can_filter_time_entries_by_project()
     {
-        $this->timeEntryRepository = \Mockery::mock(TimeEntryRepository::class);
-        app()->instance(TimeEntryRepository::class, $this->timeEntryRepository);
+        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
+
+        /** @var Task $task */
+        $task = factory(Task::class)->create([
+            'status' => Task::STATUS_ACTIVE,
+        ]);
+        $task->taskAssignee()->sync([$this->loggedInUserId]);
+
+        /** @var TimeEntry $firstTimeEntry */
+        $firstTimeEntry = factory(TimeEntry::class)->create([
+            'task_id' => $task->id,
+        ]);
+        $secondTimeEntry = factory(TimeEntry::class)->create();
+
+        $response = $this->getJson(route('time-entries.index', [
+            'filter_project' => $task->project_id,
+        ]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($firstTimeEntry->id, $data[0]['id']);
+        $this->assertEquals($task->project_id, $data[0]['task']['project_id']);
     }
 
-    public function tearDown(): void
+    /** @test */
+    public function test_can_filter_time_entries_by_user()
     {
-        parent::tearDown();
-        \Mockery::close();
+        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
+
+        /** @var TimeEntry $firstTimeEntry */
+        $firstTimeEntry = factory(TimeEntry::class)->create();
+        $secondTimeEntry = factory(TimeEntry::class)->create();
+
+        $response = $this->getJson(route('time-entries.index', [
+            'filter_user' => $firstTimeEntry->user_id,
+        ]));
+
+        $data = $response->original['data'];
+        $this->assertCount(1, $data);
+        $this->assertEquals($firstTimeEntry->id, $data[0]['id']);
+        $this->assertEquals($firstTimeEntry->user_id, $data[0]['user_id']);
     }
 
     /** @test */
     public function test_can_get_time_entry_details()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$timeEntry);
 
-        /** @var TimeEntry $timerEntry */
+        /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create();
 
         $projectId = $timeEntry->fresh()->task->project_id;
         $mockResponse = array_merge($timeEntry->toArray(), ['project_id' => $projectId]);
 
-        $this->timeEntryRepository->shouldReceive('getTimeEntryDetail')
-            ->once()
+        $this->timeEntryRepository->expects('getTimeEntryDetail')
             ->with($timeEntry->id)
             ->andReturn($mockResponse);
 
-        $response = $this->getJson("time-entries/$timeEntry->id/edit");
+        $response = $this->getJson(route('time-entries.edit', $timeEntry->id));
 
         $this->assertExactResponseData($response, $mockResponse, 'Time Entry retrieved successfully.');
     }
@@ -62,11 +110,11 @@ public function test_can_delete_time_entry()
         /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create();
 
-        $response = $this->deleteJson('time-entries/'.$timeEntry->id);
+        $response = $this->deleteJson(route('time-entries.destroy', $timeEntry->id));
 
         $this->assertSuccessMessageResponse($response, 'TimeEntry deleted successfully.');
 
-        $response = $this->getJson('time-entries/'.$timeEntry->id.'/edit');
+        $response = $this->getJson(route('time-entries.edit', $timeEntry->id));
 
         $response->assertStatus(404);
         $response->assertJson([
@@ -78,7 +126,7 @@ public function test_can_delete_time_entry()
     /** @test */
     public function test_can_get_last_task_details_of_logged_in_user()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$timeEntry);
 
         /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create();
@@ -89,11 +137,9 @@ public function test_can_get_last_task_details_of_logged_in_user()
             'project_id'  => $timeEntry->task->project_id,
         ];
 
-        $this->timeEntryRepository->shouldReceive('myLastTask')
-            ->once()
-            ->andReturn($mockResponse);
+        $this->timeEntryRepository->expects('myLastTask')->andReturn($mockResponse);
 
-        $response = $this->getJson('user-last-task-work');
+        $response = $this->getJson(route('user-last-task-work'));
 
         $this->assertExactResponseData($response, $mockResponse, 'User Task retrieved successfully.');
     }
@@ -101,19 +147,18 @@ public function test_can_get_last_task_details_of_logged_in_user()
     /** @test */
     public function test_can_get_tasks_of_given_project()
     {
-        $this->mockRepository();
+        $this->mockRepo(self::$timeEntry);
 
         /** @var Task $task */
         $task = factory(Task::class)->create();
 
         $mockResponse = [$task->id => $task->title];
 
-        $this->timeEntryRepository->shouldReceive('getTasksByProject')
-            ->once()
+        $this->timeEntryRepository->expects('getTasksByProject')
             ->with($task->project_id, null)
             ->andReturn($mockResponse);
 
-        $response = $this->getJson("projects/{$task->project_id}/tasks");
+        $response = $this->getJson(route('project-tasks', $task->project_id));
 
         $this->assertExactResponseData($response, $mockResponse, 'Project Tasks retrieved successfully.');
     }
diff --git a/tests/Controllers/UserControllerTest.php b/tests/Controllers/UserControllerTest.php
index a1297a983..6610fb4b3 100644
--- a/tests/Controllers/UserControllerTest.php
+++ b/tests/Controllers/UserControllerTest.php
@@ -5,35 +5,40 @@
 use App\Models\Project;
 use App\Models\Role;
 use App\Models\User;
-use App\Repositories\UserRepository;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Mockery\MockInterface;
 use Tests\TestCase;
+use Tests\Traits\MockRepositories;
 
 class UserControllerTest extends TestCase
 {
-    use DatabaseTransactions;
-
-    /** @var MockInterface */
-    protected $userRepo;
+    use DatabaseTransactions, MockRepositories;
 
     public function setUp(): void
     {
         parent::setUp();
         $this->signInWithDefaultAdminUser();
-        $this->withHeaders(['X-Requested-With' => 'XMLHttpRequest']);
     }
 
-    private function mockRepository()
+    /** @test */
+    public function it_can_shows_users()
     {
-        $this->userRepo = \Mockery::mock(UserRepository::class);
-        app()->instance(UserRepository::class, $this->userRepo);
-    }
+        $this->mockRepo([self::$project, self::$role]);
 
-    public function tearDown(): void
-    {
-        parent::tearDown();
-        \Mockery::close();
+        $mockProjectResponse = [['id' => 1, 'name' => 'Dummy Project']];
+        $this->projectRepository->expects('getProjectsList')
+            ->andReturn($mockProjectResponse);
+
+        $mockRoleResponse = [['id' => 1, 'name' => 'Dummy Role']];
+        $this->roleRepository->expects('getRolesList')
+            ->andReturn($mockRoleResponse);
+
+        $response = $this->get(route('users.index'));
+
+        $response->assertStatus(200)
+            ->assertViewIs('users.index')
+            ->assertSeeText('Users')
+            ->assertSeeText('New User')
+            ->assertViewHasAll(['projects' => $mockProjectResponse, 'roles' => $mockRoleResponse]);
     }
 
     /** @test */
@@ -50,7 +55,7 @@ public function test_can_retrieve_user_with_its_projects_and_roles()
         $role = factory(Role::class)->create();
         $role->users()->sync([$farhan->id]);
 
-        $response = $this->getJson("users/$farhan->id/edit");
+        $response = $this->getJson(route('users.edit', $farhan->id));
 
         $assertData = array_merge($farhan->toArray(), [
             'project_ids' => [$project->id],
@@ -65,11 +70,12 @@ public function test_can_delete_user()
         /** @var User $farhan */
         $farhan = factory(User::class)->create();
 
-        $response = $this->deleteJson('users/'.$farhan->id);
+        $response = $this->deleteJson(route('users.destroy', $farhan->id));
 
         $this->assertSuccessMessageResponse($response, 'User deleted successfully.');
 
-        $response = $this->getJson('users/'.$farhan->id.'/edit');
+        $response = $this->getJson(route('users.edit', $farhan->id));
+
         $response->assertStatus(404);
         $response->assertJson([
             'success' => false,
@@ -80,16 +86,14 @@ public function test_can_delete_user()
     /** @test */
     public function test_can_resend_email_verification()
     {
+        $this->mockRepo(self::$user);
+
         /** @var User $user */
         $user = factory(User::class)->create();
 
-        $this->mockRepository();
+        $this->userRepository->expects('resendEmailVerification')->with($user->id);
 
-        $this->userRepo->shouldReceive('resendEmailVerification')
-            ->once()
-            ->with($user->id);
-
-        $response = $this->getJson("users/$user->id/send-email");
+        $response = $this->getJson(route('send-email', $user->id));
 
         $this->assertSuccessMessageResponse($response, 'Verification email has been sent successfully.');
     }
@@ -97,16 +101,14 @@ public function test_can_resend_email_verification()
     /** @test */
     public function test_can_activate_user()
     {
+        $this->mockRepo(self::$user);
+
         /** @var User $user */
         $user = factory(User::class)->create();
 
-        $this->mockRepository();
+        $this->userRepository->expects('activeDeActiveUser')->with($user->id);
 
-        $this->userRepo->shouldReceive('activeDeActiveUser')
-            ->once()
-            ->with($user->id);
-
-        $response = $this->postJson("users/$user->id/active-de-active", []);
+        $response = $this->postJson(route('active-de-active-user', $user->id), []);
 
         $this->assertSuccessMessageResponse($response, 'User updated successfully.');
     }
@@ -114,17 +116,16 @@ public function test_can_activate_user()
     /** @test */
     public function test_can_update_profile()
     {
+        $this->mockRepo(self::$user);
+
         /** @var User $user */
         $user = factory(User::class)->raw();
         unset($user['email_verified_at']);
+        $user['password_confirmation'] = $user['password'];
 
-        $this->mockRepository();
-
-        $this->userRepo->shouldReceive('profileUpdate')
-            ->once()
-            ->with($user);
+        $this->userRepository->expects('profileUpdate')->with($user);
 
-        $response = $this->postJson('users/profile-update', $user);
+        $response = $this->postJson(route('update-profile'), $user);
 
         $this->assertSuccessMessageResponse($response, 'Profile updated successfully.');
     }
diff --git a/tests/Controllers/Validations/ActivityTypeControllerValidationTest.php b/tests/Controllers/Validations/ActivityTypeControllerValidationTest.php
index d53aabe80..a2e98fea6 100644
--- a/tests/Controllers/Validations/ActivityTypeControllerValidationTest.php
+++ b/tests/Controllers/Validations/ActivityTypeControllerValidationTest.php
@@ -13,7 +13,6 @@ class ActivityTypeControllerValidationTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->signInWithDefaultAdminUser();
     }
 
@@ -36,6 +35,7 @@ public function update_activity_type_fails_when_name_is_not_passed()
     /** @test */
     public function update_activity_type_fails_when_name_is_duplicate()
     {
+        /** @var ActivityType $activityType */
         $activityType = factory(ActivityType::class)->create();
 
         $this->put(route('activity-types.update', $activityType->id), ['name' => 'Development'])
diff --git a/tests/Controllers/Validations/ClientControllerValidationTest.php b/tests/Controllers/Validations/ClientControllerValidationTest.php
index 49d862733..b8cb7e579 100644
--- a/tests/Controllers/Validations/ClientControllerValidationTest.php
+++ b/tests/Controllers/Validations/ClientControllerValidationTest.php
@@ -18,7 +18,6 @@ class ClientControllerValidationTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->signInWithDefaultAdminUser();
     }
 
@@ -32,6 +31,7 @@ public function test_create_client_fails_when_name_is_not_passed()
     /** @test */
     public function test_update_client_fails_when_name_is_not_passed()
     {
+        /** @var Client $client */
         $client = factory(Client::class)->create();
 
         $this->put(route('clients.update', $client->id), ['name' => ''])
@@ -68,13 +68,11 @@ public function it_can_update_client_with_valid_email_and_url()
         /** @var Client $client */
         $client = factory(Client::class)->create();
 
-        $this->put(route('clients.update', $client->id),
-            [
-                'name'    => $client->name,
-                'email'   => 'valid.email@abc.com',
-                'website' => 'http://valid-website.com',
-            ])
-            ->assertSessionHasNoErrors();
+        $this->put(route('clients.update', $client->id), [
+            'name'    => $client->name,
+            'email'   => 'valid.email@abc.com',
+            'website' => 'http://valid-website.com',
+        ]);
 
         $this->assertEquals('valid.email@abc.com', $client->fresh()->email);
         $this->assertEquals('http://valid-website.com', $client->fresh()->website);
diff --git a/tests/Controllers/Validations/CommentControllerValidationTest.php b/tests/Controllers/Validations/CommentControllerValidationTest.php
index d470ed370..30943f67d 100644
--- a/tests/Controllers/Validations/CommentControllerValidationTest.php
+++ b/tests/Controllers/Validations/CommentControllerValidationTest.php
@@ -24,13 +24,13 @@ class CommentControllerValidationTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->signInWithDefaultAdminUser();
     }
 
     /** @test */
     public function test_delete_comment_fails_when_invalid_comment_id_passed()
     {
+        /** @var Task $task */
         $task = factory(Task::class)->create();
         $result = $this->delete(route('task.delete-comment', [$task->id, 999]));
 
@@ -48,18 +48,6 @@ public function test_unable_to_delete_comment_with_invalid_input()
         $this->assertExceptionMessage($result, 'Unable to delete comment.');
     }
 
-    /** @test */
-    public function test_can_delete_given_comment()
-    {
-        $this->markTestSkipped();
-        $comment = factory(Comment::class)->create(['created_by' => $this->loggedInUserId]);
-
-        $result = $this->delete(route('task.delete-comment', [$comment->task_id, $comment->id]));
-
-        $this->assertSuccessMessageResponse($result, 'Comment has been deleted successfully.');
-        $this->assertEmpty(Comment::find($comment->id));
-    }
-
     /** @test */
     public function test_unable_to_update_comment_with_invalid_input()
     {
@@ -70,17 +58,4 @@ public function test_unable_to_update_comment_with_invalid_input()
 
         $this->assertExceptionMessage($result, 'Unable to update comment.');
     }
-
-    /** @test */
-    public function test_can_update_comment_with_valid_input()
-    {
-        $this->markTestSkipped();
-        $comment = factory(Comment::class)->create(['created_by' => $this->loggedInUserId]);
-        $newText = $this->faker->text;
-
-        $result = $this->post(route('task.update-comment', [$comment->task_id, $comment->id]), ['comment' => $newText]);
-
-        $this->assertSuccessMessageResponse($result, 'Comment has been updated successfully.');
-        $this->assertEquals($newText, $comment->fresh()->comment);
-    }
 }
diff --git a/tests/Controllers/Validations/ProjectControllerValidationTest.php b/tests/Controllers/Validations/ProjectControllerValidationTest.php
index 5e2eaba46..b9da4608a 100644
--- a/tests/Controllers/Validations/ProjectControllerValidationTest.php
+++ b/tests/Controllers/Validations/ProjectControllerValidationTest.php
@@ -16,7 +16,6 @@ class ProjectControllerValidationTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->signInWithDefaultAdminUser();
     }
 
diff --git a/tests/Controllers/Validations/ReportControllerValidationTest.php b/tests/Controllers/Validations/ReportControllerValidationTest.php
index ff1ac744e..003f8a8f5 100644
--- a/tests/Controllers/Validations/ReportControllerValidationTest.php
+++ b/tests/Controllers/Validations/ReportControllerValidationTest.php
@@ -58,6 +58,7 @@ public function test_can_create_report()
     /** @test */
     public function test_update_report_fails_when_name_is_not_passed()
     {
+        /** @var Report $report */
         $report = factory(Report::class)->create();
 
         $this->put(route('reports.update', $report->id), ['name' => ''])
@@ -67,6 +68,7 @@ public function test_update_report_fails_when_name_is_not_passed()
     /** @test */
     public function test_update_report_fails_when_start_date_is_not_passed()
     {
+        /** @var Report $report */
         $report = factory(Report::class)->create();
 
         $this->put(route('reports.update', $report->id), ['start_date' => ''])
@@ -76,6 +78,7 @@ public function test_update_report_fails_when_start_date_is_not_passed()
     /** @test */
     public function test_update_report_fails_when_end_date_is_not_passed()
     {
+        /** @var Report $report */
         $report = factory(Report::class)->create();
 
         $this->put(route('reports.update', $report->id), ['end_date' => ''])
diff --git a/tests/Controllers/Validations/RoleControllerValidationTest.php b/tests/Controllers/Validations/RoleControllerValidationTest.php
index e36b5612c..9dfb1f1f6 100644
--- a/tests/Controllers/Validations/RoleControllerValidationTest.php
+++ b/tests/Controllers/Validations/RoleControllerValidationTest.php
@@ -29,6 +29,7 @@ public function test_create_role_fails_when_name_is_not_passed()
     /** @test */
     public function test_create_role_fails_when_name_is_duplicate()
     {
+        /** @var Role $role */
         $role = factory(Role::class)->create();
 
         $this->post(route('roles.store'), ['name' => $role->name])
@@ -50,6 +51,7 @@ public function it_can_create_role()
     /** @test */
     public function test_update_role_fails_when_name_is_not_passed()
     {
+        /** @var Role $role */
         $role = factory(Role::class)->create();
 
         $this->put(route('roles.update', $role->id), ['name' => ''])
@@ -69,6 +71,7 @@ public function test_update_role_fails_when_name_is_duplicate()
     /** @test */
     public function test_can_update_role_with_valid_input()
     {
+        /** @var Role $role */
         $role = factory(Role::class)->create();
         $fakeRole = factory(Role::class)->raw();
 
diff --git a/tests/Controllers/Validations/TagControllerValidationTest.php b/tests/Controllers/Validations/TagControllerValidationTest.php
index 643c54883..f74b7d389 100644
--- a/tests/Controllers/Validations/TagControllerValidationTest.php
+++ b/tests/Controllers/Validations/TagControllerValidationTest.php
@@ -26,6 +26,7 @@ public function test_create_tag_fails_when_name_is_not_passed()
     /** @test */
     public function test_create_tag_fails_when_same_name_is_already_exist()
     {
+        /** @var Tag $tag */
         $tag = factory(Tag::class)->create();
 
         $this->post(route('tags.store'), ['name' => $tag->name])
@@ -47,6 +48,7 @@ public function it_can_create_tag()
     /** @test */
     public function test_update_tag_fails_when_name_is_not_passed()
     {
+        /** @var Tag $tag */
         $tag = factory(Tag::class)->create();
 
         $this->put(route('tags.update', $tag->id), ['name' => ''])
diff --git a/tests/Controllers/Validations/TaskControllerValidationTest.php b/tests/Controllers/Validations/TaskControllerValidationTest.php
index c58ee407f..8748b9bbc 100644
--- a/tests/Controllers/Validations/TaskControllerValidationTest.php
+++ b/tests/Controllers/Validations/TaskControllerValidationTest.php
@@ -14,7 +14,6 @@ class TaskControllerValidationTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->signInWithDefaultAdminUser();
     }
 
@@ -54,6 +53,7 @@ public function test_create_task_fail_with_invalid_due_date()
     /** @test */
     public function test_update_task_fails_when_title_is_not_passed()
     {
+        /** @var Task $task */
         $task = factory(Task::class)->create();
 
         $this->put(route('tasks.update', $task->id), ['title' => ''])
@@ -63,6 +63,7 @@ public function test_update_task_fails_when_title_is_not_passed()
     /** @test */
     public function test_update_task_fails_when_project_id_is_not_passed()
     {
+        /** @var Task $task */
         $task = factory(Task::class)->create();
 
         $this->put(route('tasks.update', $task->id), ['title' => 'random string', 'project_id' => ''])
@@ -72,6 +73,7 @@ public function test_update_task_fails_when_project_id_is_not_passed()
     /** @test */
     public function test_update_task_fail_with_non_existing_project_id()
     {
+        /** @var Task $task */
         $task = factory(Task::class)->create();
 
         $this->put(route('tasks.update', $task->id), ['project_id' => 999])
@@ -81,6 +83,7 @@ public function test_update_task_fail_with_non_existing_project_id()
     /** @test */
     public function test_update_task_fail_with_invalid_due_date()
     {
+        /** @var Task $task */
         $task = factory(Task::class)->create();
         $dueDate = date('Y-m-d H:i:s', strtotime('-1 day'));
 
diff --git a/tests/Controllers/Validations/TimeEntryControllerValidationTest.php b/tests/Controllers/Validations/TimeEntryControllerValidationTest.php
index 25ff07b69..6833c21a9 100644
--- a/tests/Controllers/Validations/TimeEntryControllerValidationTest.php
+++ b/tests/Controllers/Validations/TimeEntryControllerValidationTest.php
@@ -20,7 +20,6 @@ class TimeEntryControllerValidationTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->signInWithDefaultAdminUser();
     }
 
@@ -111,6 +110,7 @@ public function test_add_time_entry_fail_when_duration_is_less_than_1_minutes()
     /** @test */
     public function test_not_allow_to_add_duplicate_time_entry()
     {
+        /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create(['user_id' => $this->defaultUserId]);
         $inputs = $this->timeEntryInputs([
             'start_time' => $timeEntry->start_time,
@@ -138,6 +138,7 @@ public function it_can_add_time_entry_of_logged_in_user()
     /** @test */
     public function test_update_time_entry_fails_when_task_id_is_not_passed()
     {
+        /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create();
 
         $this->put(route('time-entries.update', $timeEntry->id), ['task_id' => ''])
@@ -147,18 +148,19 @@ public function test_update_time_entry_fails_when_task_id_is_not_passed()
     /** @test */
     public function test_update_time_entry_fails_when_user_try_to_update_another_users_entry()
     {
+        /** @var TimeEntry $timeEntry1 */
         $timeEntry1 = factory(TimeEntry::class)->create();
         $timeEntry2 = factory(TimeEntry::class)->create(['user_id' => $this->defaultUserId]);
 
         $response = $this->put(route('time-entries.update', $timeEntry1->id), $this->timeEntryInputs());
 
-        $this->assertEquals('Time Entry not found.',
-            $response->original['message']);
+        $this->assertEquals('Time Entry not found.', $response->original['message']);
     }
 
     /** @test */
     public function test_update_time_entry_fails_when_duration_is_greater_than_12_hours()
     {
+        /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create(['user_id' => $this->defaultUserId]);
         $startTime = date('Y-m-d H:i:s', strtotime('-12 hours'));
         $endTime = date('Y-m-d H:i:s', strtotime($startTime.'+ 13 hours'));
@@ -168,12 +170,13 @@ public function test_update_time_entry_fails_when_duration_is_greater_than_12_ho
             $this->timeEntryInputs(['start_time' => $startTime, 'end_time' => $endTime])
         );
 
-        $this->assertEquals('Time Entry must be less than 12 hours.', $response->exception->getMessage());
+        $this->assertExceptionMessage($response, 'Time Entry must be less than 12 hours.');
     }
 
     /** @test */
     public function test_update_time_entry_fails_when_duration_is_less_than_1_minutes()
     {
+        /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create(['user_id' => $this->defaultUserId]);
         $startTime = date('Y-m-d H:i:s', strtotime('-45 seconds'));
         $endTime = date('Y-m-d H:i:s', strtotime('-10 seconds'));
@@ -183,12 +186,13 @@ public function test_update_time_entry_fails_when_duration_is_less_than_1_minute
             $this->timeEntryInputs(['start_time' => $startTime, 'end_time' => $endTime])
         );
 
-        $this->assertEquals('Minimum Entry time should be 1 minute.', $response->exception->getMessage());
+        $this->assertExceptionMessage($response, 'Minimum Entry time should be 1 minute.');
     }
 
     /** @test */
     public function test_not_allow_to_update_duplicate_time_entry()
     {
+        /** @var TimeEntry $firstEntry */
         $firstEntry = factory(TimeEntry::class)->create(['user_id' => $this->defaultUserId]);
 
         $startTime = date('Y-m-d h:i:s', strtotime($firstEntry->end_time.'+1 hours'));
@@ -212,6 +216,7 @@ public function test_not_allow_to_update_duplicate_time_entry()
     /** @test */
     public function it_can_update_time_entry()
     {
+        /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create(['user_id' => $this->defaultUserId]);
 
         $inputs = $this->timeEntryInputs();
diff --git a/tests/Controllers/Validations/UserControllerValidationTest.php b/tests/Controllers/Validations/UserControllerValidationTest.php
index 0f1f19b0d..4bbfd3c93 100644
--- a/tests/Controllers/Validations/UserControllerValidationTest.php
+++ b/tests/Controllers/Validations/UserControllerValidationTest.php
@@ -72,6 +72,7 @@ public function it_can_create_user()
     /** @test */
     public function test_update_user_fails_when_name_is_not_passed()
     {
+        /** @var User $user */
         $user = factory(User::class)->create();
 
         $this->put(route('users.update', $user->id), ['name' => ''])
@@ -81,6 +82,7 @@ public function test_update_user_fails_when_name_is_not_passed()
     /** @test */
     public function test_update_user_fails_when_email_is_not_passed()
     {
+        /** @var User $user */
         $user = factory(User::class)->create();
 
         $this->put(route('users.update', $user->id), ['email' => ''])
@@ -90,6 +92,7 @@ public function test_update_user_fails_when_email_is_not_passed()
     /** @test */
     public function test_update_user_fails_when_phone_number_is_more_than_ten_digits()
     {
+        /** @var User $user */
         $user = factory(User::class)->create();
 
         $this->put(route('users.update', $user->id), ['phone' => '999999999999'])->assertSessionHasErrors([
@@ -100,6 +103,7 @@ public function test_update_user_fails_when_phone_number_is_more_than_ten_digits
     /** @test */
     public function test_update_user_fails_when_phone_number_is_not_numeric()
     {
+        /** @var User $user */
         $user = factory(User::class)->create();
 
         $this->put(route('users.update', $user->id),
@@ -111,6 +115,7 @@ public function test_update_user_fails_when_phone_number_is_not_numeric()
     /** @test */
     public function test_update_user_fails_when_email_is_invalid()
     {
+        /** @var User $user */
         $user = factory(User::class)->create();
 
         $this->put(route('users.update', $user->id), ['email' => 'random email'])->assertSessionHasErrors([
diff --git a/tests/Repositories/ActivityTypeRepositoryTest.php b/tests/Repositories/ActivityTypeRepositoryTest.php
index b4d54c25d..88c3e7cb7 100644
--- a/tests/Repositories/ActivityTypeRepositoryTest.php
+++ b/tests/Repositories/ActivityTypeRepositoryTest.php
@@ -18,7 +18,6 @@ class ActivityTypeRepositoryTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->activityTypeRepo = app(ActivityTypeRepository::class);
     }
 
diff --git a/tests/Repositories/DashboardRepositoryTest.php b/tests/Repositories/DashboardRepositoryTest.php
new file mode 100644
index 000000000..98dd9bb21
--- /dev/null
+++ b/tests/Repositories/DashboardRepositoryTest.php
@@ -0,0 +1,139 @@
+<?php
+
+namespace Tests\Repositories;
+
+use App\Models\TimeEntry;
+use App\Models\User;
+use App\Repositories\DashboardRepository;
+use Carbon\Carbon;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Arr;
+use Tests\TestCase;
+
+class DashboardRepositoryTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @var DashboardRepository */
+    protected $dashboardRepo;
+
+    public function setUp(): void
+    {
+        parent::setUp();
+        $this->dashboardRepo = app(DashboardRepository::class);
+        $this->signInWithDefaultAdminUser();
+    }
+
+    /** @test */
+    public function test_should_return_start_of_the_day_and_end_of_the_day_dates_with_dates_between_it()
+    {
+        $startDate = date('Y-m-d H:i:s');
+        $endDate = date('Y-m-d H:i:s', strtotime($startDate.'+3 days'));
+
+        $date = $this->dashboardRepo->getDate($startDate, $endDate);
+
+        $starOfDate = Carbon::parse($startDate)->startOfDay();
+        $endOfDate = Carbon::parse($endDate)->endOfDay();
+        $this->assertCount(4, $date['dateArr'], 'start date + 3days');
+
+        $startDate = Carbon::parse($startDate)->format('Y-m-d');
+        foreach ($date['dateArr'] as $dateValue) {
+            $this->assertEquals($startDate, $dateValue);
+            $startDate = date('Y-m-d', strtotime($startDate.'+1 days'));
+        }
+        $this->assertEquals($starOfDate, $date['startDate']);
+        $this->assertEquals($endOfDate, $date['endDate']);
+    }
+
+    /** @test */
+    public function test_can_get_work_report_of_user_between_given_date()
+    {
+        /** @var TimeEntry $timeEntry */
+        $timeEntry = factory(TimeEntry::class)->create();
+        $differentTimeEntry = factory(TimeEntry::class)->create();
+
+        $input = [
+            'start_date' => $timeEntry->start_time,
+            'end_date'   => $timeEntry->end_time,
+            'user_id'    => $timeEntry->user_id,
+        ];
+
+        $workReport = $this->dashboardRepo->getWorkReport($input);
+
+        $starDate = date('d-M', strtotime($input['start_date']));
+        $this->assertEquals($starDate, $workReport['date'][0]);
+
+        $projectName = $timeEntry->task->project->name;
+        $this->assertCount(1, $workReport['projects']);
+        $this->assertEquals($projectName, $workReport['projects'][0]);
+        $this->assertEquals($projectName, $workReport['data'][0]->label);
+
+        $duration = round($timeEntry->duration / 60, 2);
+        $this->assertEquals($duration, $workReport['data'][0]->data[0]);
+        $this->assertEquals($timeEntry->duration, $workReport['totalRecords']);
+
+        $datePeriod = Carbon::parse($input['start_date'])
+                ->format('d M, Y').' - '.Carbon::parse($input['end_date'])
+                ->format('d M, Y');
+        $this->assertEquals($datePeriod, $workReport['label']);
+    }
+
+    /** @test */
+    public function test_can_get_developer_daily_work_report_of_all_users_between_given_date()
+    {
+        /** @var TimeEntry $firstTimeEntry */
+        $firstTimeEntry = factory(TimeEntry::class)->create();
+        $secondTimeEntry = factory(TimeEntry::class)->create();
+
+        $input = [
+            'start_date' => $firstTimeEntry->start_time,
+            'end_date'   => $secondTimeEntry->end_time,
+        ];
+
+        $workReport = $this->dashboardRepo->getDeveloperWorkReport($input);
+
+        $this->assertCount(3, $workReport['result']);
+
+        $firstEntryHours = round($firstTimeEntry->duration / 60, 2);
+        $secondEntryHours = round($secondTimeEntry->duration / 60, 2);
+        $totalHours = $firstEntryHours + $secondEntryHours;
+        $this->assertEquals($firstEntryHours, $workReport['result'][1]->total_hours);
+        $this->assertEquals($firstTimeEntry->user->name, $workReport['result'][1]->name);
+
+        $hours = Arr::pluck($workReport['result'], 'total_hours');
+        $this->assertEquals($hours[1], $workReport['data']['data'][1]);
+        $this->assertEquals($totalHours, $workReport['totalRecords']);
+
+        $day = Carbon::parse($input['start_date'])->startOfDay()->format('dS M, Y').' Report';
+        $this->assertEquals($day, $workReport['label']);
+    }
+
+    /** @test */
+    public function test_can_get_logged_in_developer_daily_work_report_between_given_date()
+    {
+        /** @var User $user */
+        $user = factory(User::class)->create();
+        $this->actingAs($user);
+
+        /** @var TimeEntry $timeEntry */
+        $timeEntry = factory(TimeEntry::class)->create(['user_id' => $user->id]);
+
+        $input = [
+            'start_date' => $timeEntry->start_time,
+            'end_date'   => $timeEntry->end_time,
+        ];
+
+        $workReport = $this->dashboardRepo->getDeveloperWorkReport($input);
+
+        $totalHours = round($timeEntry->duration / 60, 2);
+        $this->assertEquals($totalHours, $workReport['result'][0]->total_hours);
+        $this->assertEquals($timeEntry->user->name, $workReport['result'][0]->name);
+
+        $hours = Arr::pluck($workReport['result'], 'total_hours');
+        $this->assertEquals($hours[0], $workReport['data']['data'][0]);
+        $this->assertEquals($totalHours, $workReport['totalRecords']);
+
+        $day = Carbon::parse($input['start_date'])->startOfDay()->format('dS M, Y').' Report';
+        $this->assertEquals($day, $workReport['label']);
+    }
+}
diff --git a/tests/Repositories/ProjectRepositoryTest.php b/tests/Repositories/ProjectRepositoryTest.php
index fb435fd1f..45720589e 100644
--- a/tests/Repositories/ProjectRepositoryTest.php
+++ b/tests/Repositories/ProjectRepositoryTest.php
@@ -90,22 +90,34 @@ public function it_can_retrieve_projects_of_logged_in_user()
     }
 
     /** @test */
-    public function it_can_retrieve_projects_list_array_of_logged_in_user()
+    public function test_user_with_manage_projects_permission_will_get_all_projects()
     {
         $mitul = factory(User::class)->create();
         $project = factory(Project::class)->create();
         $project->users()->sync([$mitul->id]);
 
-        $projectsOfLoggedInUser = factory(Project::class)->create();
-        $projectsOfLoggedInUser->users()->sync([$this->defaultUserId]);
+        $projectOfLoggedInUser = factory(Project::class)->create();
+        $projectOfLoggedInUser->users()->sync([$this->defaultUserId]);
 
-        $myProjects = $this->projectRepo->getLoginUserAssignProjectsArr();
-        $this->assertCount(1, $myProjects);
+        $allProjects = $this->projectRepo->getLoginUserAssignProjectsArr();
 
-        $totalProjects = $this->projectRepo->getProjectsList();
-        $this->assertCount(2, $totalProjects);
+        $this->assertCount(2, $allProjects);
+    }
+
+    /** @test */
+    public function it_can_retrieve_assigned_projects_list_array_of_logged_in_user()
+    {
+        $project = factory(Project::class)->create();
+        $project->users()->sync([$this->defaultUserId]);
+
+        $mitul = factory(User::class)->create();
+        $projectOfLoggedInUser = factory(Project::class)->create();
+        $projectOfLoggedInUser->users()->sync([$mitul->id]);
+        $this->actingAs($mitul);
+
+        $allProjects = $this->projectRepo->getLoginUserAssignProjectsArr();
 
-        $this->assertArrayHasKey($projectsOfLoggedInUser->id, $myProjects);
-        $this->assertContains($projectsOfLoggedInUser->name, $myProjects);
+        $this->assertCount(1, $allProjects);
+        $this->assertContains($projectOfLoggedInUser->id, array_keys($allProjects));
     }
 }
diff --git a/tests/Repositories/ReportRepositoryTest.php b/tests/Repositories/ReportRepositoryTest.php
index 8bae3bcce..9d3e40b22 100644
--- a/tests/Repositories/ReportRepositoryTest.php
+++ b/tests/Repositories/ReportRepositoryTest.php
@@ -70,6 +70,7 @@ public function it_can_retrieve_tag_ids_of_report()
     public function it_can_retrieve_user_ids_of_report()
     {
         $report = factory(Report::class)->create();
+        /** @var User[] $users */
         $users = factory(User::class)->times(2)->create();
         $project = factory(Project::class)->create();
         $this->generateReportFilter($report->id, $users[0]->id, User::class);
@@ -100,6 +101,7 @@ public function it_can_retrieve_client_ids_of_report()
     /** @test */
     public function it_will_return_empty_when_client_filter_not_exist_on_given_report()
     {
+        /** @var Report[] $reports */
         $reports = factory(Report::class)->times(2)->create();
         $vishal = factory(Client::class)->create();
 
@@ -114,6 +116,7 @@ public function it_will_return_empty_when_client_filter_not_exist_on_given_repor
     /** @test */
     public function it_can_delete_report_filter_of_given_report()
     {
+        /** @var ReportFilter $reportFilter */
         $reportFilter = factory(ReportFilter::class)->create();
 
         $this->reportRepo->deleteFilter($reportFilter->report_id);
diff --git a/tests/Repositories/TagRepositoryTest.php b/tests/Repositories/TagRepositoryTest.php
index c18663a08..7e5c78173 100644
--- a/tests/Repositories/TagRepositoryTest.php
+++ b/tests/Repositories/TagRepositoryTest.php
@@ -18,14 +18,13 @@ class TagRepositoryTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->tagRepo = app(TagRepository::class);
     }
 
     /** @test */
     public function it_can_retrieve_tags_list()
     {
-        /** @var Collection $tag */
+        /** @var Collection $tags */
         $tags = factory(Tag::class)->times(3)->create();
 
         $tagResult = $this->tagRepo->getTagList();
diff --git a/tests/Repositories/TaskRepositoryTest.php b/tests/Repositories/TaskRepositoryTest.php
index cd8d9f655..60ab92498 100644
--- a/tests/Repositories/TaskRepositoryTest.php
+++ b/tests/Repositories/TaskRepositoryTest.php
@@ -41,6 +41,7 @@ public function test_can_store_task_with_tags_and_assignees()
 
         $createdTask = $this->taskRepo->store($task);
 
+        /** @var Task $taskRecord */
         $taskRecord = Task::with(['tags', 'taskAssignee'])->findOrFail($createdTask->id);
         $this->assertEquals($task['title'], $taskRecord->title);
         $this->assertEquals($task['tags'][0], $taskRecord->tags[0]->id);
@@ -54,6 +55,7 @@ public function test_can_store_task_with_tags_and_assignees()
     /** @test */
     public function test_can_update_task_with_tags_and_assignees()
     {
+        /** @var Task $task */
         $task = factory(Task::class)->create();
         $preparedTask = factory(Task::class)
             ->states('tag', 'assignees')
@@ -66,6 +68,7 @@ public function test_can_update_task_with_tags_and_assignees()
 
         $this->assertTrue($updatedTask);
 
+        /** @var Task $taskRecord */
         $taskRecord = Task::with(['tags', 'taskAssignee'])->findOrFail($task->id);
         $this->assertEquals('random string', $taskRecord->title);
         $this->assertEquals($preparedTask['tags'][0], $taskRecord->tags[0]->id);
@@ -76,6 +79,17 @@ public function test_can_update_task_with_tags_and_assignees()
         });
     }
 
+    /** @test */
+    public function test_can_generate_unique_task_number_when_task_project_is_different()
+    {
+        $task = factory(Task::class)->create();
+        $updateTask = factory(Task::class)->raw(['due_date' => date('Y-m-d h:i:s', strtotime('+3 days'))]);
+
+        $updatedTask = $this->taskRepo->update($updateTask, $task->id);
+
+        $this->assertNotEmpty(Task::findOrFail($task->id)->pluck('task_number'));
+    }
+
     /** @test */
     public function it_can_retrieve_task_list()
     {
@@ -114,6 +128,7 @@ public function it_can_retrieve_task_list_of_given_projects()
     /** @test */
     public function it_can_add_comment()
     {
+        /** @var Task $task */
         $task = factory(Task::class)->create();
         $comment = $this->taskRepo->addComment([
             'comment' => 'random text',
@@ -133,6 +148,7 @@ public function test_can_return_unique_task_number()
             'project_id'  => $project->id,
             'task_number' => 3,
         ]);
+
         $uniqueTaskNumber = $this->taskRepo->getUniqueTaskNumber($project->id);
 
         $this->assertNotEmpty($uniqueTaskNumber);
@@ -142,6 +158,7 @@ public function test_can_return_unique_task_number()
     /** @test */
     public function test_can_return_unique_task_number_one_when_no_tasks_on_given_project()
     {
+        /** @var Project $project */
         $project = factory(Project::class)->create();
 
         $uniqueTaskNumber = $this->taskRepo->getUniqueTaskNumber($project->id);
@@ -194,6 +211,7 @@ public function test_can_get_active_task_of_logged_in_user()
     /** @test */
     public function test_can_get_task_details_with_task_duration()
     {
+        /** @var TimeEntry $timeEntry */
         $timeEntry = factory(TimeEntry::class)->create(['duration' => 5]);
 
         $taskDetails = $this->taskRepo->getTaskDetails($timeEntry->task_id);
@@ -202,6 +220,20 @@ public function test_can_get_task_details_with_task_duration()
         $this->assertEquals('00 Hours and 05 Minutes', $taskDetails->totalDuration);
     }
 
+    /** @test */
+    public function test_can_get_task_details_of_given_user()
+    {
+        /** @var TimeEntry $firstEntry */
+        $firstEntry = factory(TimeEntry::class)->create(['duration' => 125]);
+
+        $taskDetails = $this->taskRepo->getTaskDetails($firstEntry->task_id, [
+            'user_id' => $firstEntry->user_id,
+        ]);
+
+        $this->assertEquals($firstEntry->task_id, $taskDetails->id);
+        $this->assertEquals('02 Hours and 05 Minutes', $taskDetails->totalDuration);
+    }
+
     /** @test */
     public function test_can_update_task_status()
     {
diff --git a/tests/Repositories/TimeEntryRepositoryTest.php b/tests/Repositories/TimeEntryRepositoryTest.php
index 0ae529e11..6f2129007 100644
--- a/tests/Repositories/TimeEntryRepositoryTest.php
+++ b/tests/Repositories/TimeEntryRepositoryTest.php
@@ -25,7 +25,6 @@ class TimeEntryRepositoryTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->timeEntryRepo = app(TimeEntryRepository::class);
         $this->signInWithDefaultAdminUser();
     }
@@ -96,9 +95,12 @@ public function test_can_update_duration_of_time_entry_and_make_start_and_end_ti
     {
         $timeEntry = factory(TimeEntry::class)->create();
 
-        $result = $this->timeEntryRepo->updateTimeEntry(
-            ['duration' => 120, 'start_time' => '', 'end_time' => ''], $timeEntry->id
-        );
+        $result = $this->timeEntryRepo->updateTimeEntry([
+            'duration'   => 120,
+            'start_time' => '',
+            'end_time'   => '',
+        ], $timeEntry->id);
+
         $this->assertTrue($result);
 
         $timeEntry = $timeEntry->fresh();
@@ -107,6 +109,20 @@ public function test_can_update_duration_of_time_entry_and_make_start_and_end_ti
         $this->assertEmpty($timeEntry->end_time);
     }
 
+    /** @test */
+    public function test_can_update_duration_of_time_entry_via_stop_watch()
+    {
+        $timeEntry = factory(TimeEntry::class)->create();
+
+        $result = $this->timeEntryRepo->updateTimeEntry([
+            'start_time' => $timeEntry->start_time,
+            'end_time'   => $timeEntry->end_time,
+        ], $timeEntry->id);
+
+        $this->assertTrue($result);
+        $this->assertEquals(TimeEntry::STOPWATCH, $timeEntry->fresh()->entry_type);
+    }
+
     /** @test */
     public function test_can_get_tasks_of_logged_in_user()
     {
diff --git a/tests/Repositories/UserRepositoryTest.php b/tests/Repositories/UserRepositoryTest.php
index 463590f20..29d20c5f3 100644
--- a/tests/Repositories/UserRepositoryTest.php
+++ b/tests/Repositories/UserRepositoryTest.php
@@ -23,7 +23,6 @@ class UserRepositoryTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-
         $this->userRepo = app(UserRepository::class);
     }
 
diff --git a/tests/Traits/MockRepositories.php b/tests/Traits/MockRepositories.php
new file mode 100644
index 000000000..c881a223a
--- /dev/null
+++ b/tests/Traits/MockRepositories.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Tests\Traits;
+
+use App\Repositories\ActivityTypeRepository;
+use App\Repositories\ClientRepository;
+use App\Repositories\DashboardRepository;
+use App\Repositories\PermissionRepository;
+use App\Repositories\ProjectRepository;
+use App\Repositories\RoleRepository;
+use App\Repositories\TagRepository;
+use App\Repositories\TaskRepository;
+use App\Repositories\TimeEntryRepository;
+use App\Repositories\UserRepository;
+use Mockery\MockInterface;
+
+/**
+ * Trait MockRepositories.
+ */
+trait MockRepositories
+{
+    public static $user = 'userRepository';
+    public static $project = 'projectRepository';
+    public static $role = 'roleRepository';
+    public static $permission = 'permissionRepository';
+    public static $tag = 'tagRepository';
+    public static $client = 'clientRepository';
+    public static $dashboard = 'dashboardRepository';
+    public static $timeEntry = 'timeEntryRepository';
+    public static $task = 'taskRepository';
+    public static $activityType = 'activityTypeRepository';
+
+    /** @var MockInterface */
+    public $userRepository;
+    /** @var MockInterface */
+    public $projectRepository;
+    /** @var MockInterface */
+    public $roleRepository;
+    /** @var MockInterface */
+    public $permissionRepository;
+    /** @var MockInterface */
+    public $tagRepository;
+    /** @var MockInterface */
+    public $clientRepository;
+    /** @var MockInterface */
+    public $taskRepository;
+    /** @var MockInterface */
+    public $dashboardRepository;
+    /** @var MockInterface */
+    public $timeEntryRepository;
+    /** @var MockInterface */
+    public $activityTypeRepository;
+
+    public function mockRepo($repoNames)
+    {
+        if (!is_array($repoNames)) {
+            $repoNames = [$repoNames];
+        }
+
+        foreach ($repoNames as $repoName) {
+            $repoInstance = null;
+            switch ($repoName) {
+                case self::$user:
+                    $repoInstance = UserRepository::class;
+                    break;
+                case self::$role:
+                    $repoInstance = RoleRepository::class;
+                    break;
+                case self::$permission:
+                    $repoInstance = PermissionRepository::class;
+                    break;
+                case self::$task:
+                    $repoInstance = TaskRepository::class;
+                    break;
+                case self::$tag:
+                    $repoInstance = TagRepository::class;
+                    break;
+                case self::$project:
+                    $repoInstance = ProjectRepository::class;
+                    break;
+                case self::$activityType:
+                    $repoInstance = ActivityTypeRepository::class;
+                    break;
+                case self::$client:
+                    $repoInstance = ClientRepository::class;
+                    break;
+                case self::$dashboard:
+                    $repoInstance = DashboardRepository::class;
+                    break;
+                case self::$timeEntry:
+                    $repoInstance = TimeEntryRepository::class;
+                    break;
+            }
+
+            $this->$repoName = \Mockery::mock($repoInstance);
+            app()->instance($repoInstance, $this->$repoName);
+        }
+    }
+}