diff --git a/cypress/e2e/course_creation.cy.js b/cypress/e2e/course_creation.cy.js
index 33f6eee9..94ecafcc 100644
--- a/cypress/e2e/course_creation.cy.js
+++ b/cypress/e2e/course_creation.cy.js
@@ -32,6 +32,8 @@ describe("Course Creation", () => {
 			.contains("Preview Video")
 			.type("https://www.youtube.com/embed/-LPmw2Znl2c");
 		cy.get("[id=tags]").type("Learning{enter}Frappe{enter}ERPNext{enter}");
+		cy.get(".search-input").click();
+		cy.get("[id^=headlessui-combobox-option-").first().click();
 		cy.get("label").contains("Published").click();
 		cy.get("label").contains("Published On").type("2021-01-01");
 		cy.button("Save").click();
diff --git a/frontend/src/components/UserAvatar.vue b/frontend/src/components/UserAvatar.vue
index bc77f21a..a720be27 100644
--- a/frontend/src/components/UserAvatar.vue
+++ b/frontend/src/components/UserAvatar.vue
@@ -1,15 +1,17 @@
 <template>
-	<Avatar
-		class="avatar border border-gray-300"
-		v-if="user"
-		:label="user.full_name"
-		:image="user.user_image"
-		:size="size"
-		v-bind="$attrs"
-	/>
+	<Tooltip :text="user.full_name">
+		<Avatar
+			class="avatar border border-gray-300 cursor-auto"
+			v-if="user"
+			:label="user.full_name"
+			:image="user.user_image"
+			:size="size"
+			v-bind="$attrs"
+		/>
+	</Tooltip>
 </template>
 <script setup>
-import { Avatar } from 'frappe-ui'
+import { Avatar, Tooltip } from 'frappe-ui'
 const props = defineProps({
 	user: {
 		type: Object,
diff --git a/lms/lms/doctype/lms_certificate/test_lms_certificate.py b/lms/lms/doctype/lms_certificate/test_lms_certificate.py
index f7754e43..f84f3acb 100644
--- a/lms/lms/doctype/lms_certificate/test_lms_certificate.py
+++ b/lms/lms/doctype/lms_certificate/test_lms_certificate.py
@@ -12,7 +12,13 @@ from lms.lms.doctype.lms_course.test_lms_course import new_course
 
 class TestLMSCertificate(unittest.TestCase):
 	def test_certificate_creation(self):
-		course = new_course("Test Certificate", {"enable_certification": 1, "expiry": 2})
+		course = new_course(
+			"Test Certificate",
+			{
+				"enable_certification": 1,
+				"expiry": 2,
+			},
+		)
 		certificate = create_certificate(course.name)
 
 		self.assertEqual(certificate.member, "Administrator")
diff --git a/lms/lms/doctype/lms_course/test_lms_course.py b/lms/lms/doctype/lms_course/test_lms_course.py
index e688d6f3..1c90f8f1 100644
--- a/lms/lms/doctype/lms_course/test_lms_course.py
+++ b/lms/lms/doctype/lms_course/test_lms_course.py
@@ -68,12 +68,19 @@ def new_course(title, additional_filters=None):
 		return frappe.get_doc("LMS Course", course)
 	else:
 		create_evaluator()
+		user = frappe.db.get_value(
+			"User",
+			{
+				"user_type": "System User",
+			},
+		)
 		filters = {
 			"title": title,
 			"short_introduction": title,
 			"description": title,
 			"video_link": "https://youtu.be/pEbIhUySqbk",
 			"image": "/assets/lms/images/course-home.png",
+			"instructors": [{"instructor": user}],
 		}
 
 		if additional_filters:
diff --git a/lms/lms/test_utils.py b/lms/lms/test_utils.py
index e2ed069d..f655d321 100644
--- a/lms/lms/test_utils.py
+++ b/lms/lms/test_utils.py
@@ -22,6 +22,8 @@ class TestUtils(unittest.TestCase):
 		)
 
 	def test_evaluation_details(self):
+		user = new_user("Eval", "eval@test.com")
+
 		course = new_course(
 			"Test Evaluation Details",
 			{
@@ -30,9 +32,9 @@ class TestUtils(unittest.TestCase):
 				"evaluator": "evaluator@example.com",
 				"max_attempts": 3,
 				"duration": 2,
+				"instructors": [{"instructor": user.name}],
 			},
 		)
-		user = new_user("Eval", "eval@test.com")
 
 		# Two evaluations failed within max attempts. Check eligibility for a third evaluation
 		create_evaluation(user.name, course.name, getdate("21-03-2022"), 0.4, "Fail")