diff --git a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent/RestInfo/PositionAndRole/__tests__/index.test.js b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent/RestInfo/PositionAndRole/__tests__/index.test.js
index 0e6cf4b..d5c9546 100644
--- a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent/RestInfo/PositionAndRole/__tests__/index.test.js
+++ b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent/RestInfo/PositionAndRole/__tests__/index.test.js
@@ -82,7 +82,7 @@ describe("CreateContent Component From Expert Management", () => {
         });
         it('Should Select An Item With Valid Value of role', async () => {
             render(<MockAppWithProviders><CreateFormMock Component={PositionAndRole}/></MockAppWithProviders>);
-            const roleInput = screen.getByTestId("input-role-id")
+            const roleInput = await waitFor(() => screen.getByTestId("input-role-id"));
             const roleSelectOpener = await waitFor(() => screen.getByTestId("option-opener-role"));
 
             fireEvent.mouseDown(roleSelectOpener);
diff --git a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent/__tests__/index.test.js b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent/__tests__/index.test.js
index cccc604..3c7ca0d 100644
--- a/src/components/dashboard/expert-management/Form/CreateForm/CreateContent/__tests__/index.test.js
+++ b/src/components/dashboard/expert-management/Form/CreateForm/CreateContent/__tests__/index.test.js
@@ -6,15 +6,19 @@ import CreateForm from "@/components/dashboard/expert-management/Form/CreateForm
 
 describe("CreateContent Component From Expert Management", () => {
     describe("Rendering", () => {
-        it("Password TextField Rendered", () => {
+        it("Password TextField Rendered", async () => {
             render(<MockAppWithProviders><CreateContent/></MockAppWithProviders>);
-            const cancelBtn = screen.queryByText('بستن');
-            expect(cancelBtn).toBeInTheDocument();
+            await waitFor(() => {
+                const cancelBtn = screen.queryByText('بستن');
+                expect(cancelBtn).toBeInTheDocument();
+            });
         });
-        it("Password TextField Rendered", () => {
+        it("Password TextField Rendered", async () => {
             render(<MockAppWithProviders><CreateContent/></MockAppWithProviders>);
-            const cancelBtn = screen.queryByText('ثبت');
-            expect(cancelBtn).toBeInTheDocument();
+            await waitFor(() => {
+                const cancelBtn = screen.queryByText('ثبت');
+                expect(cancelBtn).toBeInTheDocument();
+            });
         });
     });
     describe("Behavioral", () => {
@@ -25,29 +29,35 @@ describe("CreateContent Component From Expert Management", () => {
 
             const submitButton = screen.queryByText('ثبت');
 
-            const nameInput = screen.queryByLabelText('نام');
+            const nameInput = screen.queryByLabelText('نام کامل');
             const usernameInput = screen.queryByLabelText('نام کاربری');
             const emailInput = screen.queryByLabelText('پست الکترونیک');
             const phoneNumberInput = screen.queryByLabelText('شماره همراه');
+            const telephoneIdInput = screen.queryByLabelText('کد تلفن');
             const nationalIdInput = screen.queryByLabelText('کد ملی');
             const passwordInput = screen.queryByLabelText('رمز عبور');
             const positionInput = screen.queryByLabelText('سمت');
             const provinceSelectOpener = screen.getByTestId("option-opener-province");
             const roleSelectOpener = screen.getByTestId("option-opener-role");
+            const genderSelectOpener = screen.getByTestId("option-opener-gender");
             fireEvent.mouseDown(provinceSelectOpener);
             fireEvent.mouseDown(roleSelectOpener);
+            fireEvent.mouseDown(genderSelectOpener);
 
             fireEvent.change(nameInput, {target: {value: 'nameTest'}});
             fireEvent.change(usernameInput, {target: {value: 'usernameTest'}});
             fireEvent.change(emailInput, {target: {value: 'emailTest'}});
             fireEvent.change(phoneNumberInput, {target: {value: 'phoneNumberTest'}});
+            fireEvent.change(telephoneIdInput, {target: {value: 'telephoneIdTest'}});
             fireEvent.change(nationalIdInput, {target: {value: 'nationalIdTest'}});
             fireEvent.change(passwordInput, {target: {value: 'passwordTest'}});
             fireEvent.change(positionInput, {target: {value: 'positionTest'}});
-            const selectItemProvince = await waitFor(() => screen.queryByText("آذربایجان شرقی"));
+            const selectItemProvince = screen.queryByText("آذربایجان شرقی");
             fireEvent.click(selectItemProvince);
-            const selectItemRole = await waitFor(() => screen.queryByText("ادمین"));
+            const selectItemRole = screen.queryByText("ادمین");
             fireEvent.click(selectItemRole);
+            const selectItemGender = screen.queryByText("مرد");
+            fireEvent.click(selectItemGender);
 
             await waitFor(() => {
                 expect(submitButton).not.toBeDisabled();