Merge locators
Merge pull request #515 from owdqa/feature/loop_tests

Merge locators