fixing more google3 tests