Modified them in addressbook tests, I think we can do the rest as we go.