Remove FindsByValue, add static locators to By