Changes to tests so they work here and in google3.