changes to make test_locators work