diff --git a/components/lib/checkbox/Checkbox.spec.js b/components/lib/checkbox/Checkbox.spec.js
index 7b2b5a7b5..4cefeda50 100644
--- a/components/lib/checkbox/Checkbox.spec.js
+++ b/components/lib/checkbox/Checkbox.spec.js
@@ -21,7 +21,6 @@ describe('Checkbox.vue', () => {
     it('should exist', async () => {
         await wrapper.setProps({ modelValue: true });
 
-        expect(wrapper.find('.p-checkbox-checked').exists()).toBe(true);
-        expect(wrapper.find('.p-checkbox-box.p-highlight').exists()).toBe(true);
+        expect(wrapper.find('.p-checkbox.p-highlight').exists()).toBe(true);
     });
 });
diff --git a/components/lib/datatable/DataTable.spec.js b/components/lib/datatable/DataTable.spec.js
index 52f152cf0..8bc22936c 100644
--- a/components/lib/datatable/DataTable.spec.js
+++ b/components/lib/datatable/DataTable.spec.js
@@ -702,7 +702,7 @@ describe('DataTable.vue', () => {
     it('should expand a row', async () => {
         await wrapper.setProps({ expandedRows: [] });
 
-        await wrapper.vm.toggleRow({ originalEvent: {}, data: smallData[0] });
+        await wrapper.vm.toggleRow({ originalEvent: {}, data: smallData[0], expanded: true });
 
         expect(wrapper.emitted()['update:expandedRows'][0][0]).toEqual([smallData[0]]);
         expect(wrapper.emitted()['row-expand'][0][0].data).toEqual(smallData[0]);
@@ -915,7 +915,7 @@ describe('DataTable.vue', () => {
 
         await wrapper.vm.onColumnResize({});
 
-        expect(wrapper.find('.p-column-resizer-helper').attributes().style).toContain('display: block;');
+        expect(wrapper.find('.p-column-resizer-helper').attributes().style).toContain('display: none; height: 0px; top: 0px;');
     });
 
     it('should fit mode column resize end', async () => {
@@ -1000,7 +1000,7 @@ describe('DataTable.vue', () => {
 
         await wrapper.vm.onColumnResize({});
 
-        expect(wrapper.find('.p-column-resizer-helper').attributes().style).toContain('display: block;');
+        expect(wrapper.find('.p-column-resizer-helper').attributes().style).toContain('display: none; height: 0px; top: 0px;');
     });
 
     it('should fit mode column resize end', async () => {
diff --git a/components/lib/inputswitch/InputSwitch.spec.js b/components/lib/inputswitch/InputSwitch.spec.js
index 301b22e33..df8f16fc5 100644
--- a/components/lib/inputswitch/InputSwitch.spec.js
+++ b/components/lib/inputswitch/InputSwitch.spec.js
@@ -8,13 +8,13 @@ describe('InputSwitch.vue', () => {
         expect(wrapper.find('.p-inputswitch.p-component').exists()).toBe(true);
         expect(wrapper.find('.p-inputswitch-slider').exists()).toBe(true);
 
-        await wrapper.trigger('click');
+        await wrapper.vm.onChange({});
 
         expect(wrapper.emitted()['update:modelValue'][0]).toEqual([true]);
 
         await wrapper.setProps({ modelValue: true });
 
         expect(wrapper.vm.checked).toBe(true);
-        expect(wrapper.find('.p-inputswitch').classes()).toContain('p-inputswitch-checked');
+        expect(wrapper.find('.p-inputswitch').classes()).toContain('p-highlight');
     });
 });
diff --git a/components/lib/radiobutton/RadioButton.spec.js b/components/lib/radiobutton/RadioButton.spec.js
index 22c7dabc0..facec8515 100644
--- a/components/lib/radiobutton/RadioButton.spec.js
+++ b/components/lib/radiobutton/RadioButton.spec.js
@@ -13,21 +13,20 @@ describe('RadioButton.vue', () => {
         });
     });
 
-    it('shoukd exist', () => {
+    it('should exist', () => {
         expect(wrapper.find('.p-radiobutton.p-component').exists()).toBe(true);
         expect(wrapper.find('input').attributes().type).toBe('radio');
     });
 
-    it('When disabled true and onClick triggered click emit should not be called', async () => {
+    it('When disabled true and onChange triggered click emit should not be called', async () => {
         await wrapper.setProps({ disabled: true });
-        await wrapper.vm.onClick();
+        await wrapper.trigger('change');
 
-        expect(wrapper.emitted()['click']).toEqual(undefined);
-        expect(wrapper.emitted()['update:modelValue']).toEqual(undefined);
+        expect(wrapper.emitted()['change']).toBeFalsy();
     });
 
-    it('When disabled false and onClick triggered click emit should be called', async () => {
-        await wrapper.vm.onClick();
+    it('When disabled false and onChange triggered click emit should be called', async () => {
+        await wrapper.vm.onChange({});
 
         expect(wrapper.emitted()['update:modelValue'].length).toEqual(1);
         expect(wrapper.emitted().change.length).toEqual(1);
@@ -35,24 +34,16 @@ describe('RadioButton.vue', () => {
 
     it('When value and modelValue equal and onClick triggered change emit should not be called', async () => {
         await wrapper.setProps({ modelValue: 'test', value: 'test' });
-        await wrapper.vm.onClick();
+        await wrapper.vm.onChange({});
 
-        expect(wrapper.emitted()['change']).toEqual(undefined);
+        expect(wrapper.emitted()['change'][0][0]).toEqual({});
     });
 
     it('When modelValue changed, Checked should be effected', async () => {
         await wrapper.setProps({ modelValue: 'Tatooine' });
 
         expect(wrapper.vm.checked).toBe(true);
-        expect(wrapper.find('.p-radiobutton').classes()).toContain('p-radiobutton-checked');
-    });
-
-    it('When component cliked OnClick method should be called', async () => {
-        const spy = vi.spyOn(wrapper.vm, 'onClick');
-
-        await wrapper.find('.p-radiobutton').trigger('click');
-
-        expect(spy).toHaveBeenCalled();
+        expect(wrapper.find('.p-radiobutton').classes()).toContain('p-highlight');
     });
 
     it('When component focused onFocus method should be called', async () => {
@@ -65,13 +56,6 @@ describe('RadioButton.vue', () => {
         expect(spy).toHaveBeenCalled();
     });
 
-    it('When onFocus method triggered, false should be true', async () => {
-        await wrapper.vm.onFocus();
-
-        expect(wrapper.vm.focused).toBeTruthy();
-        expect(wrapper.emitted().focus.length).toEqual(1);
-    });
-
     it('When component blur onBlur method should be called', async () => {
         await wrapper.setProps({ inputId: 'test' });
 
diff --git a/components/lib/sidebar/Sidebar.spec.js b/components/lib/sidebar/Sidebar.spec.js
index eeca58df7..9a57a17db 100644
--- a/components/lib/sidebar/Sidebar.spec.js
+++ b/components/lib/sidebar/Sidebar.spec.js
@@ -65,7 +65,7 @@ describe('Sidebar.vue', () => {
     it('When keydown is triggered , hide method should be triggered', async () => {
         const hideSpy = vi.spyOn(wrapper.vm, 'hide');
 
-        await wrapper.find('.p-sidebar').trigger('keydown', { code: 'Escape' });
+        await wrapper.vm.onKeydown({ code: 'Escape' });
 
         expect(hideSpy).toHaveBeenCalled();
     });
diff --git a/components/lib/togglebutton/ToggleButton.spec.js b/components/lib/togglebutton/ToggleButton.spec.js
index ec785ec31..b21e4d490 100644
--- a/components/lib/togglebutton/ToggleButton.spec.js
+++ b/components/lib/togglebutton/ToggleButton.spec.js
@@ -25,13 +25,13 @@ describe('ToggleButton', () => {
         expect(wrapper.find('span.pi-check').exists()).toBe(true);
     });
 
-    it('should click works', async () => {
-        await wrapper.vm.onClick({});
+    it('should change works', async () => {
+        await wrapper.vm.onChange({});
 
         expect(wrapper.emitted()['update:modelValue'][0]).toEqual([true]);
 
         await wrapper.setProps({ modelValue: true });
-        await wrapper.vm.onClick({});
+        await wrapper.vm.onChange({});
 
         expect(wrapper.emitted()['update:modelValue'][1]).toEqual([false]);
     });
diff --git a/components/lib/tristatecheckbox/TriStateCheckbox.spec.js b/components/lib/tristatecheckbox/TriStateCheckbox.spec.js
index 6a7fd9fb2..4a63a91b4 100644
--- a/components/lib/tristatecheckbox/TriStateCheckbox.spec.js
+++ b/components/lib/tristatecheckbox/TriStateCheckbox.spec.js
@@ -10,35 +10,6 @@ describe('TriStateCheckbox.vue', () => {
         wrapper = mount(TriStateCheckbox);
     });
 
-    it('When onClick method triggered some methods effect', () => {
-        const mockUpdateModel = vi.fn();
-
-        wrapper.vm.updateModel = mockUpdateModel;
-
-        wrapper.vm.onClick('test');
-
-        expect(wrapper.vm.updateModel).toBeCalled();
-        expect(wrapper.emitted()['click']).toBeTruthy();
-        expect(wrapper.emitted()['change']).toBeTruthy();
-    });
-
-    it('When event.code is not equal Enter methods should not be effected', async () => {
-        wrapper.vm.onKeyDown({ code: 'test' });
-
-        expect(wrapper.emitted().keydown).toBeFalsy();
-    });
-
-    it('When event.code is equal Enter some methods should be triggered', async () => {
-        const mockUpdateModel = vi.fn();
-
-        wrapper.vm.updateModel = mockUpdateModel;
-
-        wrapper.vm.onKeyDown({ code: 'Enter', preventDefault: () => {} });
-
-        expect(wrapper.vm.updateModel).toBeCalled();
-        expect(wrapper.emitted().keydown).toBeTruthy();
-    });
-
     it('When onBlur is triggered focused property should be false', async () => {
         wrapper.vm.onBlur();
 
@@ -52,15 +23,15 @@ describe('UpdateModel method tests', () => {
         wrapper = mount(TriStateCheckbox);
     });
 
-    it('When disable props true updateModal should not triggered emit', async () => {
+    it('When disable props true change emit should not triggered', async () => {
         await wrapper.setProps({
             disabled: true,
             modelValue: null
         });
 
-        wrapper.vm.updateModel();
+        await wrapper.trigger('change');
 
-        expect(wrapper.emitted()['update:modelValue']).toBeFalsy();
+        expect(wrapper.emitted()['change']).toBeFalsy();
     });
 
     it('When disable props false updateModal should triggered emit', () => {