diff --git a/cypress/e2e/24-ndv-paired-item.cy.ts b/cypress/e2e/24-ndv-paired-item.cy.ts
index a2bb527723..9829a22d22 100644
--- a/cypress/e2e/24-ndv-paired-item.cy.ts
+++ b/cypress/e2e/24-ndv-paired-item.cy.ts
@@ -31,6 +31,9 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('exist')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
@@ -88,9 +91,13 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1000')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
-		ndv.getters.inputTableRow(1).realHover();
+
+			ndv.getters.inputTableRow(1).realHover();
 		cy.wait(50);
 		ndv.getters.outputHoveringItem().should('have.text', '1000');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
@@ -102,6 +109,9 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1111')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 		ndv.getters.inputTableRow(1).realHover();
@@ -139,31 +149,49 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1111')
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
-		ndv.getters.outputTableRow(1).should('have.text', '1111').realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '1111');
+		ndv.getters.outputTableRow(1).realHover();
+
+
+		ndv.getters.outputTableRow(3).should('have.text', '4444');
+		ndv.getters.outputTableRow(3).realHover();
 
-		ndv.getters.outputTableRow(3).should('have.text', '4444').realHover();
 		ndv.getters
 			.inputTableRow(3)
 			.should('have.text', '4444')
+		ndv.getters
+			.inputTableRow(3)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
 		ndv.actions.changeOutputRunSelector('2 of 2 (6 items)');
 		cy.wait(50);
 
-		ndv.getters.inputTableRow(1).should('have.text', '1000').realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '1000');
+		ndv.getters.inputTableRow(1).realHover();
+
+		ndv.getters
+			.outputTableRow(1)
+			.should('have.text', '1000')
 		ndv.getters
 			.outputTableRow(1)
 			.should('have.text', '1000')
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(3).should('have.text', '2000').realHover();
+		ndv.getters.outputTableRow(3).should('have.text', '2000');
+		ndv.getters.outputTableRow(3).realHover();
+
 		ndv.getters
 			.inputTableRow(3)
 			.should('have.text', '2000')
+
+		ndv.getters
+			.inputTableRow(3)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 	});
@@ -190,6 +218,9 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1111')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 		ndv.getters.inputTableRow(1).realHover();
@@ -201,6 +232,9 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '1000')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 		ndv.getters.outputTableRow(1).should('have.text', '1000');
@@ -212,8 +246,12 @@ describe('NDV', () => {
 		ndv.getters
 			.inputTableRow(1)
 			.should('have.text', '6666')
+
+		ndv.getters
+			.inputTableRow(1)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
+
 		ndv.getters.outputHoveringItem().should('not.exist');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 
@@ -224,6 +262,7 @@ describe('NDV', () => {
 			.inputTableRow(1)
 			.should('have.text', "This is an item, but it's empty.")
 			.realHover();
+
 		ndv.getters.outputHoveringItem().should('have.length', 6);
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 	});
@@ -240,17 +279,27 @@ describe('NDV', () => {
 		ndv.actions.switchOutputMode('Table');
 
 		ndv.actions.switchOutputBranch('False Branch (2 items)');
-		ndv.getters.outputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '8888');
+		ndv.getters.outputTableRow(1).realHover();
+
 		ndv.getters
 			.inputTableRow(5)
 			.should('have.text', '8888')
+
+		ndv.getters
+			.inputTableRow(5)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(2).should('have.text', '9999').realHover();
+		ndv.getters.outputTableRow(2).should('have.text', '9999');
+		ndv.getters.outputTableRow(2).realHover();
+
 		ndv.getters
 			.inputTableRow(6)
 			.should('have.text', '9999')
+
+		ndv.getters
+			.inputTableRow(6)
 			.invoke('attr', 'data-test-id')
 			.should('equal', 'hovering-item');
 
@@ -260,20 +309,27 @@ describe('NDV', () => {
 
 		ndv.actions.switchInputBranch('True Branch');
 		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
-		ndv.getters.outputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '8888')
+		ndv.getters.outputTableRow(1).realHover();
+		cy.wait(100);
 		ndv.getters.inputHoveringItem().should('not.exist');
 
-		ndv.getters.inputTableRow(1).should('have.text', '1111').realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '1111')
+		ndv.getters.inputTableRow(1).realHover();
+		cy.wait(100);
 		ndv.getters.outputHoveringItem().should('not.exist');
 
 		ndv.actions.switchInputBranch('False Branch');
-		ndv.getters.inputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '8888');
+		ndv.getters.inputTableRow(1).realHover();
 
 		ndv.actions.changeOutputRunSelector('2 of 2 (4 items)');
-		ndv.getters.outputTableRow(1).should('have.text', '1111').realHover();
+		ndv.getters.outputTableRow(1).should('have.text', '1111');
+		ndv.getters.outputTableRow(1).realHover();
 
 		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
-		ndv.getters.inputTableRow(1).should('have.text', '8888').realHover();
+		ndv.getters.inputTableRow(1).should('have.text', '8888');
+		ndv.getters.inputTableRow(1).realHover();
 		ndv.getters.outputHoveringItem().should('have.text', '8888');
 		// todo there's a bug here need to fix ADO-534
 		// ndv.getters.outputHoveringItem().should('not.exist');