Updated e2e test with refactored code for better use of protractor locators