diff --git a/cypress/integration/test_organizational_chart_desktop.js b/cypress/integration/test_organizational_chart_desktop.js
index 0493732..52863f1 100644
--- a/cypress/integration/test_organizational_chart_desktop.js
+++ b/cypress/integration/test_organizational_chart_desktop.js
@@ -1,17 +1,16 @@
 context('Organizational Chart', () => {
 	before(() => {
 		cy.login();
-		cy.visit('/app');
-
-		cy.call('erpnext.tests.ui_test_helpers.create_employee_records');
+		cy.visit('/app/website');
 		cy.awesomebar('Organizational Chart');
 
-		cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
-		cy.get('@input')
-			.clear({ force: true })
-			.type('Test Org Chart', { force: true });
-		cy.wait(200);
-		cy.get('@input').blur({ force: true });
+		cy.call('erpnext.tests.ui_test_helpers.create_employee_records').then(() => {
+			cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
+			cy.get('@input')
+				.clear({ force: true })
+				.type('Test Org Chart{enter}', { force: true })
+				.blur({ force: true });
+		});
 	});
 
 	it('renders root nodes and loads children for the first expandable node', () => {
@@ -27,7 +26,7 @@
 
 		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
 			// children of 1st root visible
-			cy.get(`[data-parent="${employee_records.message[0]}"]`).as('child-node');
+			cy.get(`div[data-parent="${employee_records.message[0]}"]`).as('child-node');
 			cy.get('@child-node')
 				.should('have.length', 1)
 				.should('be.visible');
diff --git a/cypress/integration/test_organizational_chart_mobile.js b/cypress/integration/test_organizational_chart_mobile.js
index 1dcfbcf..2272a31 100644
--- a/cypress/integration/test_organizational_chart_mobile.js
+++ b/cypress/integration/test_organizational_chart_mobile.js
@@ -2,17 +2,16 @@
 	before(() => {
 		cy.login();
 		cy.viewport(375, 667);
-		cy.visit('/app');
-
-		cy.call('erpnext.tests.ui_test_helpers.create_employee_records');
+		cy.visit('/app/website');
 		cy.awesomebar('Organizational Chart');
 
-		cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
-		cy.get('@input')
-			.clear({ force: true })
-			.type('Test Org Chart', { force: true });
-		cy.wait(200);
-		cy.get('@input').blur({ force: true });
+		cy.call('erpnext.tests.ui_test_helpers.create_employee_records').then(() => {
+			cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
+			cy.get('@input')
+				.clear({ force: true })
+				.type('Test Org Chart{enter}', { force: true })
+				.blur({ force: true });
+		});
 	});
 
 	it('renders root nodes', () => {
@@ -40,7 +39,7 @@
 			cy.get('.hierarchy-mobile').find('.level').first().find('ul.node-children').children()
 				.should('have.length', 2);
 
-			cy.get(`[data-parent="${employee_records.message[1]}"]`).first().as('child-node');
+			cy.get(`div[data-parent="${employee_records.message[1]}"]`).first().as('child-node');
 			cy.get('@child-node').should('be.visible');
 
 			cy.get('@child-node')