Change locators to address intermittent failures

The old analog clock locator was changing its size and location

```v1.0.1``` -> merge
```v1-train``` -> test and merge