Simple locators
Tests coverage for simple locators
Merge pull request #864 from mfalesni/simpleloc

Simple locators