Still some timing issues against the smoke build, but less this time. - Mainly adding timeouts against cy.visit - Improving some structure with the close modal command in a few places