Fix issue with tests using wrong locator