diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php
index 2a41a15491..bff8ecfb93 100644
--- a/app/Http/Controllers/Agent/kb/ArticleController.php
+++ b/app/Http/Controllers/Agent/kb/ArticleController.php
@@ -46,7 +46,7 @@ public function __construct()
         // checking authentication
         $this->middleware('auth');
         // checking roles
-        $this->middleware('roles');
+        $this->middleware('role.agent');
         SettingsController::language();
     }
 
diff --git a/app/Http/Controllers/Agent/kb/CategoryController.php b/app/Http/Controllers/Agent/kb/CategoryController.php
index bdf2b75b80..b0ba32ee65 100644
--- a/app/Http/Controllers/Agent/kb/CategoryController.php
+++ b/app/Http/Controllers/Agent/kb/CategoryController.php
@@ -40,7 +40,7 @@ public function __construct()
         // checking authentication
         $this->middleware('auth');
         // checking roles
-        $this->middleware('roles');
+        $this->middleware('role.agent');
         SettingsController::language();
     }
 
@@ -150,9 +150,9 @@ public function store(Category $category, CategoryRequest $request)
         try {
             $category->fill($request->input())->save();
 
-            return Redirect::back()->with('success', Lang::get('lang.category_inserted_successfully'));
+            return redirect('category')->with('success', Lang::get('lang.category_inserted_successfully'));
         } catch (Exception $e) {
-            return Redirect::back()->with('fails', Lang::get('lang.category_not_inserted').'<li>'.$e->getMessage().'</li>');
+            return redirect('category')->with('fails', Lang::get('lang.category_not_inserted').'<li>'.$e->getMessage().'</li>');
         }
     }
 
diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php
index 1e2ff6dc76..c115e16311 100644
--- a/app/Http/Controllers/Agent/kb/PageController.php
+++ b/app/Http/Controllers/Agent/kb/PageController.php
@@ -38,7 +38,7 @@ public function __construct(Page $page)
         // checking authentication
         $this->middleware('auth');
         // checking roles
-        $this->middleware('roles');
+        $this->middleware('role.agent');
         $this->page = $page;
         SettingsController::language();
     }
@@ -86,7 +86,7 @@ public function getData()
                         /* add column Actions */
                         /* there are action buttons and modal popup to delete a data column */
                         ->addColumn('Actions', function ($model) {
-                            return '<span  data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=page/'.$model->slug.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
+                            return '<span  data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=page/'.$model->id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
 				<div class="modal fade" id="deletepage'.$model->id.'">
         			<div class="modal-dialog">
             			<div class="modal-content">
@@ -150,7 +150,7 @@ public function store(PageRequest $request)
     public function edit($slug)
     {
         try {
-            $page = $this->page->where('slug', $slug)->first();
+            $page = $this->page->where('id', $slug)->first();
 
             return view('themes.default1.agent.kb.pages.edit', compact('page'));
         } catch (Exception $e) {
@@ -169,7 +169,7 @@ public function edit($slug)
     public function update($slug, PageRequest $request)
     {
         // get pages with respect to slug
-        $pages = $this->page->where('slug', $slug)->first();
+        $pages = $this->page->where('id', $slug)->first();
         $sl = $request->input('name');
         $slug = Str::slug($sl, '-');
 
diff --git a/app/Http/Controllers/Agent/kb/SettingsController.php b/app/Http/Controllers/Agent/kb/SettingsController.php
index 50f88d37e0..abd5197a75 100644
--- a/app/Http/Controllers/Agent/kb/SettingsController.php
+++ b/app/Http/Controllers/Agent/kb/SettingsController.php
@@ -42,7 +42,7 @@ public function __construct()
         // checking authentication
         $this->middleware('auth');
         // checking roles
-        $this->middleware('roles');
+        $this->middleware('role.agent');
         $this->language();
     }
 
diff --git a/app/Http/Controllers/Client/kb/UserController.php b/app/Http/Controllers/Client/kb/UserController.php
index 3a4aa922a0..531d226de2 100644
--- a/app/Http/Controllers/Client/kb/UserController.php
+++ b/app/Http/Controllers/Client/kb/UserController.php
@@ -124,7 +124,7 @@ public function show($slug, Article $article, Category $category)
         if ($arti) {
             return view('themes.default1.client.kb.article-list.show', compact('arti'));
         } else {
-            return redirect('404');
+            return Redirect::back()->with('fails', Lang::get('lang.sorry_not_processed'));
         }
     }
 
@@ -150,7 +150,6 @@ public function home(Article $article, Category $category, Relationship $relatio
         if (Config::get('database.install') == '%0%') {
             return redirect('step1');
         } else {
-            //$categorys = $category->get();
             $categorys = $category->get();
             // $categorys->setPath('home');
             /* direct to view with $article_id */
@@ -235,7 +234,6 @@ public function postComment($slug, Article $article, Request $request, Comment $
     {
         $request->validate([
             'comment' => 'required',
-
         ]);
 
         $article = $article->where('slug', $slug)->first();
@@ -265,7 +263,16 @@ public function postComment($slug, Article $article, Request $request, Comment $
 
     public function getPage($name, Page $page)
     {
-        $page = $page->where('slug', $name)->first();
+        $page = $page->where('slug', $name);
+
+        if (!Auth::check() || \Auth::user()->role == 'user') {
+            $page = $page
+                    ->where(['status' => 1, 'visibility'=>1])
+                    ->first();
+        } else {
+            $page = $page->where('status', 1)->first();
+        }
+
         if ($page) {
             return view('themes.default1.client.kb.article-list.pages', compact('page'));
         } else {
diff --git a/app/Http/Requests/kb/ArticleRequest.php b/app/Http/Requests/kb/ArticleRequest.php
index 4472e62ebe..c6d5c17c60 100644
--- a/app/Http/Requests/kb/ArticleRequest.php
+++ b/app/Http/Requests/kb/ArticleRequest.php
@@ -24,8 +24,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'name' => 'required',
-            //'slug'        => 'required|unique:kb_article',
+            'name'        => 'required|unique:kb_article',
             'description' => 'required',
             'category_id' => 'required',
         ];
diff --git a/app/Http/Requests/kb/ArticleUpdate.php b/app/Http/Requests/kb/ArticleUpdate.php
index c8c3526cd3..129a214502 100644
--- a/app/Http/Requests/kb/ArticleUpdate.php
+++ b/app/Http/Requests/kb/ArticleUpdate.php
@@ -23,11 +23,14 @@ public function authorize()
      */
     public function rules()
     {
-        $id = $this->segments()[1];
+        //$id = $this->segments()[1];
+        $segments = $this->segments();
+
+        $id = isset($segments[1]) ? $segments[1] : null;
 
         return [
-            'name'        => 'required',
-            'slug'        => 'required|unique:kb_article,slug,'.$id.',id',
+            'name'        => 'required|unique:kb_article,name,'.$id,
+            'slug'        => 'required|unique:kb_article,slug,'.$id,
             'description' => 'required',
             'category_id' => 'required',
         ];
diff --git a/app/Http/Requests/kb/PageRequest.php b/app/Http/Requests/kb/PageRequest.php
index 8e9c0daf8c..f9a730ad5a 100644
--- a/app/Http/Requests/kb/PageRequest.php
+++ b/app/Http/Requests/kb/PageRequest.php
@@ -23,10 +23,11 @@ public function authorize()
      */
     public function rules()
     {
-        $slug = $this->segment(2);
+        $id = $this->segment(2);
 
         return [
-            'name' => 'required|unique:kb_pages,slug,'.$slug,
+            'name'        => 'required|unique:kb_pages,name,'.$id,
+            'description' => 'required',
         ];
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index 45316b2271..b12fae9245 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,27 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="bootstrap/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">app/</directory>
-    </include>
-  </coverage>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="bootstrap/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
   <testsuites>
-    <testsuite name="feature">
-      <directory>tests/Feature</directory>
+    <testsuite name="all">
+      <directory>./tests/</directory>
     </testsuite>
     <testsuite name="unit">
-      <directory>tests/Unit</directory>
+      <directory>./tests/unit</directory>
     </testsuite>
   </testsuites>
+  <filter>
+    <whitelist addUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">app/</directory>
+    </whitelist>
+  </filter>
   <php>
     <env name="APP_ENV" value="testing"/>
-   <!-- <env name="DB_CONNECTION" value="testing"/>
-    <env name="DB_DATABASE" value="testing_db"/> -->
+    <env name="DB_CONNECTION" value="testing"/>
+    <env name="DB_DATABASE" value="testing_db"/>
     <env name="CACHE_DRIVER" value="array"/>
     <env name="SESSION_DRIVER" value="array"/>
     <env name="QUEUE_CONNECTION" value="sync"/>
     <env name="MAIL_MAILER" value="mail"/>
     <env name="APP_URL" value="http://localhost:8000"/>
+    <env name="DB_DATABASE" value="testing_db"/>
     <env name="DB_INSTALL" value="1"/>
   </php>
-</phpunit>
+</phpunit>
\ No newline at end of file
diff --git a/resources/views/themes/default1/agent/kb/pages/create.blade.php b/resources/views/themes/default1/agent/kb/pages/create.blade.php
index ce9d18ea40..12c0a6321c 100644
--- a/resources/views/themes/default1/agent/kb/pages/create.blade.php
+++ b/resources/views/themes/default1/agent/kb/pages/create.blade.php
@@ -83,7 +83,7 @@ class="nav-item menu-open"
                     
                     <div class="form-group col-sm-12 {{ $errors->has('description') ? 'has-error' : '' }}">
                         {!! Form::label('description',Lang::get('lang.description')) !!}
-
+                        <span class="text-red"> *</span>
                         <div class="form-group" style="background-color:white">
                             {!! Form::textarea('description',null,['class' => 'form-control color','size' => '110x15','id'=>'myNicEditor','placeholder'=>Lang::get('lang.enter_the_description')]) !!}
                         </div>
diff --git a/resources/views/themes/default1/agent/kb/pages/edit.blade.php b/resources/views/themes/default1/agent/kb/pages/edit.blade.php
index 3118d35a15..a2d14f7c20 100644
--- a/resources/views/themes/default1/agent/kb/pages/edit.blade.php
+++ b/resources/views/themes/default1/agent/kb/pages/edit.blade.php
@@ -35,7 +35,7 @@ class="nav-item menu-open"
 
 @section('content')
 
-{!! Form::model($page,['url' => 'page/'.$page->slug, 'method' => 'PATCH','files'=>true]) !!}
+{!! Form::model($page,['url' => 'page/'.$page->id, 'method' => 'PATCH','files'=>true]) !!}
 
 @if(Session::has('errors'))
 <?php //dd($errors); ?>
@@ -130,7 +130,7 @@ class="nav-item menu-open"
             </div>
 
             <div class="card-footer">
-               
+
                 {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!}
             </div>
         </div>
diff --git a/resources/views/themes/default1/client/kb/article-list/show.blade.php b/resources/views/themes/default1/client/kb/article-list/show.blade.php
index eba6828a3e..b0713481c4 100644
--- a/resources/views/themes/default1/client/kb/article-list/show.blade.php
+++ b/resources/views/themes/default1/client/kb/article-list/show.blade.php
@@ -254,9 +254,22 @@ function submitComment(userId, comment) {
                                 $(".form-group").removeClass("has-error");
 
                                 // Perform your custom validation here
-                                var name = $("#comment-name").val().trim();
-                                var email = $("#comment-email").val().trim();
-                                var comment = $("#comment-comment").val().trim();
+                                var nameElement = $("#comment-name");
+                                var emailElement = $("#comment-email");
+                                var commentElement = $("#comment-comment");
+
+                                if (nameElement.length > 0) {
+                                    var name = nameElement.val().trim();
+                                }
+
+                                if (emailElement.length > 0) {
+                                    var email = emailElement.val().trim();
+                                }
+
+                                if (commentElement.length > 0) {
+                                    var comment = commentElement.val().trim();
+                                }
+
 
                                 // Flag to track if there are any errors
                                 var hasErrors = false;
diff --git a/resources/views/themes/default1/client/layout/client.blade.php b/resources/views/themes/default1/client/layout/client.blade.php
index 0d1c15fe15..5c9d8e9462 100644
--- a/resources/views/themes/default1/client/layout/client.blade.php
+++ b/resources/views/themes/default1/client/layout/client.blade.php
@@ -160,7 +160,11 @@
                                     </ul>
                                 </li>
 
-                                 <?php $pages = App\Model\kb\Page::where('status', '1')->where('visibility', '1')->get();
+                                 <?php
+                                    if(!Auth::check() || Auth::user()->role == 'user')
+                                 $pages = App\Model\kb\Page::where('status', '1')->where('visibility', '1')->get();
+                                    else
+                                        $pages = App\Model\kb\Page::where('status', '1')->get();
                                 ?>
                                  @if(count($pages))
                                 <li @yield('pages') class="nav-item dropdown">
diff --git a/tests/Unit/ArticleControllerTest.php b/tests/Unit/ArticleControllerTest.php
new file mode 100644
index 0000000000..8dadd659a5
--- /dev/null
+++ b/tests/Unit/ArticleControllerTest.php
@@ -0,0 +1,243 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Http\Requests\kb\ArticleRequest;
+use App\Http\Requests\kb\ArticleUpdate;
+use App\Http\Requests\kb\CategoryRequest;
+use App\Model\kb\Article;
+use App\Model\kb\Category;
+use App\Model\kb\Relationship;
+use App\User;
+use Faker\Factory as FakerFactory;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
+use Tests\TestCase;
+
+class ArticleControllerTest extends TestCase
+{
+    //use DatabaseTransactions;
+    protected $user; // Declare a user property
+
+    // Set up the authenticated user before each test
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $faker = FakerFactory::create();
+
+        //Create User -> Agent
+
+        //$str = Str::random(10);
+        $str = 'demopass';
+        $password = Hash::make($str);
+        $email = $faker->unique()->email();
+        $user = new User([
+            'first_name'   => $faker->firstName(),
+            'last_name'    => $faker->lastName(),
+            'email'        => $email,
+            'user_name'    => $faker->unique()->userName(),
+            'password'     => $password,
+            'assign_group' => 1,
+            'primary_dpt'  => 1,
+            'active'       => 1,
+            'role'         => 'agent',
+            'agent_tzone'  => 81,
+        ]);
+        $user->save();
+
+        // Check if data is inserted
+        $this->assertDatabaseHas('users', ['email'=>$email]);
+
+        // Authenticate as the created user
+        $this->actingAs($user);
+
+        $this->assertAuthenticated();
+    }
+
+    /** @test */
+    public function it_can_display_the_article_index_page()
+    {
+        $response = $this->get(route('article.index'));
+
+        $response->assertStatus(200);
+    }
+
+    public function testStoreArticleWithCategories()
+    {
+        // Create a Category model for testing
+        $data = [
+            'name'        => 'Test Category',
+            'description' => 'Test Category Description',
+        ];
+
+        $validator = Validator::make($data, (new CategoryRequest())->rules());
+
+        $this->assertTrue($validator->passes());
+
+        $response = $this->post(route('category.store'), $data);
+
+        $response->assertStatus(302);
+        $response->assertSessionHas('success');
+        $this->assertDatabaseHas('kb_category', $data);
+        $category = Category::latest()->first();
+
+        // Article data
+        $articleData = [
+            'name'       => 'Test Article',
+            'description'=> 'Test Article Description',
+            'category_id'=> $category->id,
+            'year'       => '2023',
+            'month'      => '10',
+            'day'        => '03',
+            'hour'       => '12',
+            'minute'     => '30',
+        ];
+
+        $articleRequest = new ArticleRequest($articleData);
+
+        // Act
+        try {
+            $validator = Validator::make($articleData, (new ArticleRequest())->rules());
+
+            $this->assertTrue($validator->passes());
+            $response = $this->post(route('article.store'), $articleData);
+            $response->assertStatus(200);
+        } catch (Exception $e) {
+            $response = null;
+        }
+
+        // Assert
+        if ($response) {
+            $response->assertStatus(200); // Check if the response status code is a redirect (302)
+
+            $article = Article::latest()->first();
+
+            $article_relationship = new Relationship();
+
+            $article_relationship->category_id = $category->id;
+            $article_relationship->article_id = $article->id;
+            $article_relationship->save();
+
+            // Verify that the article was created and the category relationship exists
+            $this->assertDatabaseHas('kb_article', [
+                'name'         => $articleData['name'],
+                'slug'         => Str::slug($articleData['name'], '-'),
+                'publish_time' => $articleData['year'].'-'.$articleData['month'].'-'.$articleData['day'].' '.$articleData['hour'].':'.$articleData['minute'].':00',
+            ]);
+
+            // Check if the category relationship exists
+            $this->assertDatabaseHas('kb_article_relationship', [
+                'category_id' => $category->id,
+                'article_id'  => Article::latest()->first()->id, // Get the ID of the latest created article
+            ]);
+        } else {
+            $this->fail('Exception thrown: '.$e->getMessage());
+        }
+    }
+
+    public function testEditArticle()
+    {
+        // Arrange
+        $article = Article::latest()->first(); // Create a sample Article for testing
+        $relationship = Relationship::latest()->first(); // Create a sample Relationship for testing
+        $category = Category::latest()->first(); // Create a sample Category for testing
+
+        $assign = $relationship->where('article_id', 'id')->pluck('category_id');
+        $category = $category->pluck('id', 'name');
+
+        $response = $this->get(
+            "/article/{$article->id}/edit",
+            ['category'   => $category,
+                'article' => $article,
+                'assign'  => $assign,
+            ]
+        );
+        $response->assertStatus(200);
+    }
+
+    public function testUpdateArticle()
+    {
+        $article = Article::latest()->first();
+        $category = Category::latest()->first();
+
+        $data = [
+            'id'          => $article->id,
+            'name'        => 'Updated Article Name',
+            'description' => 'Updated Description',
+            'slug'        => Str::slug('Updated Article Name', '-'),
+            'category_id' => [1, 2],
+            'year'        => '2023',
+            'month'       => '10',
+            'day'         => '03',
+            'hour'        => '2',
+            'minute'      => '20',
+        ];
+
+        $validator = Validator::make($data, (new ArticleUpdate())->rules());
+
+        $this->assertTrue($validator->passes());
+
+        $response = $this->put(route('article.update', $article->id), $data);
+
+        $response->assertStatus(302);
+
+        $article_relationship = Relationship::latest()->first();
+        $article_relationship = $article_relationship->where('article_id', $article->id);
+        $article_relationship->delete();
+
+        $article = Article::latest()->first();
+        $relation = new Relationship();
+        $relation->category_id = $category->id;
+        $relation->article_id = $article->id;
+        $relation->save();
+    }
+
+    /** @test */
+    public function it_can_delete_a_category()
+    {
+        // Create a sample article, relationship
+        $article = Article::latest()->first();
+        $relationship = Relationship::find($article->id);
+
+        // Ensure the destroy route works as expected
+
+        $response = $this->get("/article/delete/{$article->slug}");
+
+        // Assert that success message is flashed
+        $response->assertSessionHas('success', Lang::get('lang.article_deleted_successfully'));
+
+        // Create a category
+        $category = Category::latest()->first();
+
+        // Create a related relationship (you may need to adjust this based on your actual relationships)
+        $relation = Relationship::find($category->id);
+
+        // Call the destroy method with the category ID
+        $response = $this->get("/category/delete/{$category->id}");
+
+        // Assert that the category is deleted from the database
+        $this->assertDatabaseMissing('kb_category', ['id' => $category->id]);
+    }
+
+    public function it_cannot_delete_a_article_if_related()
+    {
+        // Create a category
+        $article = Article::find(1);
+
+        // Call the destroy method with the category ID (without creating related records)
+        $response = $this->get("/article/delete/{$article->slug}");
+
+        // Assert that the category is not deleted from the database
+        $this->assertDatabaseHas('kb_article', ['id' => $article->id]);
+
+        // Assert that the response is a redirect
+        $response->assertRedirect();
+
+        // Assert that the response has a failure message
+        $response->assertSessionHas('fails', Lang::get('lang.article_not_deleted'));
+    }
+}
diff --git a/tests/Unit/CategoryControllerTest.php b/tests/Unit/CategoryControllerTest.php
new file mode 100644
index 0000000000..6cc884bae2
--- /dev/null
+++ b/tests/Unit/CategoryControllerTest.php
@@ -0,0 +1,233 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Http\Requests\kb\CategoryRequest;
+use App\Model\kb\Category;
+use App\Model\kb\Relationship;
+use App\User;
+use Faker\Factory as FakerFactory;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Str;
+use Tests\TestCase;
+
+class CategoryControllerTest extends TestCase
+{
+    //use DatabaseTransactions;
+    protected $user; // Declare a user property
+
+    // Set up the authenticated user before each test
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $faker = FakerFactory::create();
+
+        //Create User -> Agent
+
+        //$str = Str::random(10);
+        $str = 'demopass';
+        $password = Hash::make($str);
+        $email = $faker->unique()->email();
+        $user = new User([
+            'first_name'   => $faker->firstName(),
+            'last_name'    => $faker->lastName(),
+            'email'        => $email,
+            'user_name'    => $faker->unique()->userName(),
+            'password'     => $password,
+            'assign_group' => 1,
+            'primary_dpt'  => 1,
+            'active'       => 1,
+            'role'         => 'agent',
+            'agent_tzone'  => 81,
+        ]);
+        $user->save();
+
+        // Check if data is inserted
+        $this->assertDatabaseHas('users', ['email'=>$email]);
+
+        // Authenticate as the created user
+        $this->actingAs($user);
+
+        $this->assertAuthenticated();
+    }
+
+    /** @test */
+    public function it_can_display_the_category_index_page()
+    {
+        $response = $this->get(route('category.index'));
+
+        $response->assertStatus(200);
+    }
+
+    public function testValidationPasses()
+    {
+        $data = [
+            'name'        => 'New Category',
+            'description' => 'Category Description',
+        ];
+
+        $validator = Validator::make($data, (new CategoryRequest())->rules());
+
+        $this->assertTrue($validator->passes());
+
+        $response = $this->post(route('category.store'), $data);
+
+        $response->assertStatus(302);
+        $response->assertSessionHas('success');
+        $this->assertDatabaseHas('kb_category', $data);
+    }
+
+    public function testValidationFailsWhenNameMissing()
+    {
+        $data = [
+            'description' => 'Category Description',
+        ];
+
+        $validator = Validator::make($data, (new CategoryRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('name'));
+    }
+
+    public function testValidationFailsWhenNameExceedsMaxLength()
+    {
+        $data = [
+            'name'        => str_repeat('A', 251),
+            'description' => 'Category Description',
+        ];
+
+        $validator = Validator::make($data, (new CategoryRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('name'));
+    }
+
+    public function testValidationFailsWhenNameNotUnique()
+    {
+        $data = [
+            'name'        => 'Greetings',
+            'description' => 'Category Description',
+        ];
+
+        $validator = Validator::make($data, (new CategoryRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('name'));
+    }
+
+    public function testValidationFailsWhenDescriptionMissing()
+    {
+        $data = [
+            'name' => 'New Category',
+        ];
+
+        $validator = Validator::make($data, (new CategoryRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('description'));
+    }
+
+    public function testEditCategory()
+    {
+        $category = Category::latest()->first();
+        $categories = Category::pluck('name', 'id')->toArray();
+        $response = $this->get(
+            "/category/{$category->id}/edit",
+            ['category'      => $category,
+                'categories' => $categories,
+            ]
+        );
+        $response->assertStatus(200);
+    }
+
+    /** @test */
+    public function it_can_update_an_existing_category()
+    {
+        // Retrieve an existing category from the database
+        $category = Category::latest()->first();
+
+        $data = [
+            'name'        => 'Updated Category Name',
+            'description' => 'Updated Description',
+        ];
+
+        $validator = Validator::make($data, (new CategoryRequest())->rules());
+
+        $this->assertTrue($validator->passes());
+
+        $response = $this->put(route('category.update', $category->id), $data);
+
+        $response->assertStatus(302);
+        $response->assertSessionHas('success');
+        $this->assertDatabaseHas('kb_category', $data);
+    }
+
+    /** @test */
+    public function it_cannot_update_an_existing_category()
+    {
+        // Retrieve an existing category from the database
+        $category = Category::latest()->first();
+
+        $data = [
+            'name'        => 'Greetings',
+            'description' => 'Updated Description',
+        ];
+
+        $validator = Validator::make($data, (new CategoryRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $response = $this->put(route('category.update', $category->id), $data);
+        $response->assertStatus(302);
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('name'));
+    }
+
+    /** @test */
+    public function it_can_delete_a_category()
+    {
+        // Create a category
+        $category = Category::latest()->first();
+
+        // Create a related relationship (you may need to adjust this based on your actual relationships)
+        $relation = Relationship::find($category->id);
+
+        // Call the destroy method with the category ID
+        $response = $this->get("/category/delete/{$category->id}");
+
+        // Assert that the category is deleted from the database
+        $this->assertDatabaseMissing('kb_category', ['id' => $category->id]);
+
+        // Assert that the response is a redirect
+        $response->assertRedirect();
+
+        // Assert that the response has a success message
+        $response->assertSessionHas('success', Lang::get('lang.category_deleted_successfully'));
+    }
+
+    /** @test */
+    public function it_cannot_delete_a_category_if_related()
+    {
+        // Create a category
+        $category = Category::find(1);
+
+        // Call the destroy method with the category ID (without creating related records)
+        $response = $this->get("/category/delete/{$category->id}");
+
+        // Assert that the category is not deleted from the database
+        $this->assertDatabaseHas('kb_category', ['id' => $category->id]);
+
+        // Assert that the response is a redirect
+        $response->assertRedirect();
+
+        // Assert that the response has a failure message
+        $response->assertSessionHas('fails', Lang::get('lang.category_not_deleted'));
+    }
+}
diff --git a/tests/Unit/PageControllerTest.php b/tests/Unit/PageControllerTest.php
new file mode 100644
index 0000000000..67f298d536
--- /dev/null
+++ b/tests/Unit/PageControllerTest.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace Tests\Unit;
+
+use App\Http\Requests\kb\PageRequest;
+use App\Model\kb\Page;
+use App\User;
+use Faker\Factory as FakerFactory;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Validator;
+use Tests\TestCase;
+
+class PageControllerTest extends TestCase
+{
+    use DatabaseTransactions;
+    protected $user; // Declare a user property
+
+    // Set up the authenticated user before each test
+    public function setUp(): void
+    {
+        parent::setUp();
+
+        $faker = FakerFactory::create();
+
+        //Create User -> Agent
+
+        //$str = Str::random(10);
+        $str = 'demopass';
+        $password = Hash::make($str);
+        $email = $faker->unique()->email();
+        $user = new User([
+            'first_name'   => $faker->firstName(),
+            'last_name'    => $faker->lastName(),
+            'email'        => $email,
+            'user_name'    => $faker->unique()->userName(),
+            'password'     => $password,
+            'assign_group' => 1,
+            'primary_dpt'  => 1,
+            'active'       => 1,
+            'role'         => 'agent',
+            'agent_tzone'  => 81,
+        ]);
+        $user->save();
+
+        // Check if data is inserted
+        $this->assertDatabaseHas('users', ['email'=>$email]);
+
+        // Authenticate as the created user
+        $this->actingAs($user);
+
+        $this->assertAuthenticated();
+    }
+
+    /** @test */
+    public function it_can_display_the_page_index_page()
+    {
+        $response = $this->get(route('page.index'));
+
+        $response->assertStatus(200);
+    }
+
+    public function testCreateMethod()
+    {
+        $response = $this->get('/page/create');
+
+        $response->assertStatus(200);
+    }
+
+    public function testValidationPasses()
+    {
+        $data = [
+            'name'        => 'New Page',
+            'description' => 'Page Description',
+        ];
+
+        $validator = Validator::make($data, (new PageRequest())->rules());
+
+        $this->assertTrue($validator->passes());
+
+        $response = $this->post(route('page.store'), $data);
+
+        $response->assertStatus(302);
+        $response->assertSessionHas('success');
+        $this->assertDatabaseHas('kb_pages', $data);
+    }
+
+    public function testValidationFailsWhenNameMissing()
+    {
+        $data = [
+            'description' => 'Page Description',
+        ];
+
+        $validator = Validator::make($data, (new PageRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('name'));
+    }
+
+    public function testValidationFailsWhenNameNotUnique()
+    {
+        $data = [
+            'name'        => 'Page1',
+            'description' => 'Page Description',
+        ];
+
+        $validator = Validator::make($data, (new PageRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('name'));
+    }
+
+    public function testValidationFailsWhenDescriptionMissing()
+    {
+        $data = [
+            'name' => 'New',
+        ];
+
+        $validator = Validator::make($data, (new PageRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('description'));
+    }
+
+    public function testEditPage()
+    {
+        $page = Page::latest()->first();
+
+        $response = $this->get('/page/'.$page->id.'/edit');
+
+        $response->assertStatus(200);
+    }
+
+    public function testUpdatePage()
+    {
+        $page = Page::latest()->first();
+
+        $data = [
+            'name'        => 'Updated Page Name',
+            'description' => 'Updated Description',
+        ];
+
+        $validator = Validator::make($data, (new PageRequest())->rules());
+
+        $this->assertTrue($validator->passes());
+        $response = $this->put('/page/'.$page->id, $data);
+
+        $response->assertStatus(302); // Assuming a successful update redirects
+        $this->assertDatabaseHas('kb_pages', $data);
+        // You can add more assertions as needed.
+    }
+
+    public function testCannotUpdatePage()
+    {
+        $page = Page::latest()->first();
+
+        $data = [
+            'name'        => 'Page1',
+            'description' => 'Updated Description',
+        ];
+
+        $validator = Validator::make($data, (new PageRequest())->rules());
+
+        $this->assertFalse($validator->passes());
+        $response = $this->put('/page/'.$page->id, $data);
+        $response->assertStatus(302);
+        $this->assertTrue($validator->fails());
+        $this->assertTrue($validator->errors()->has('name'));
+    }
+
+    public function testDestroyMethod()
+    {
+        $page = Page::latest()->first();
+
+        $response = $this->delete('/page/'.$page->id);
+
+        $response->assertStatus(302); // Assuming a successful deletion redirects
+        $this->assertDatabaseMissing('kb_pages', ['id' => $page->id]);
+        // You can add more assertions as needed.
+    }
+}