diff --git a/cypress/e2e/shadedLighting.cy.js b/cypress/e2e/shadedLighting.cy.js
index 40ead6f..04c5222 100644
--- a/cypress/e2e/shadedLighting.cy.js
+++ b/cypress/e2e/shadedLighting.cy.js
@@ -1,8 +1,8 @@
 describe('Shaded Lighting', () => {
   it('Toggle the EDL checkbox on and off', () => {
     cy.visit('http://localhost:5173/#')
-    cy.get('#chkEDLEnabled').uncheck()
-    cy.get('#chkEDLEnabled').check()
+    cy.get('#chkEDLEnabled').uncheck().should('not.be.checked')
+    cy.get('#chkEDLEnabled').check().should('be.checked')
   })
 
   it('Change radius', function () {
diff --git a/cypress/e2e/viewAttribute.cy.js b/cypress/e2e/viewAttribute.cy.js
index 3edae8b..bc69bf6 100644
--- a/cypress/e2e/viewAttribute.cy.js
+++ b/cypress/e2e/viewAttribute.cy.js
@@ -4,6 +4,10 @@ describe('View Attribute', () => {
 
     cy.get('#tools img[data-i18n="[title]tt.point_measurement"]').click()
     cy.get('#potree_render_area canvas[tabindex="2222"]').click()
+
+    // Verify attribute was created
+    cy.get('#scene_object_properties').should('be.visible')
+    cy.get('#g_point_body').children().should('have.length.at.least', 1)
   })
 
   it('Delete view attribute ', function () {
@@ -26,12 +30,14 @@ describe('View Attribute', () => {
 
   it('Switch between attributes ', function () {
     cy.visit('http://localhost:5173/#')
+    // Create three point measurements
     cy.get('#tools img[data-i18n="[title]tt.point_measurement"]').click()
     cy.get('#potree_render_area canvas[tabindex="2222"]').click()
     cy.get('#tools img[data-i18n="[title]tt.point_measurement"]').click()
     cy.get('#potree_render_area canvas[tabindex="2222"]').click()
     cy.get('#tools img[data-i18n="[title]tt.point_measurement"]').click()
     cy.get('#potree_render_area canvas[tabindex="2222"]').click()
+    // Switch between the created points
     cy.get('#g_point_body span[title="Point #2"]').click()
     cy.get('#g_point_body div:nth-child(1)').click()
     cy.get('#g_point_body span[title="Point #3"]').click()