Unit tests
Modified `Locator` class