Updated locators for first review
Merge pull request #288 from AndreiH/first_review_locator

Updated locators for first review