Merge "Remove unneeded methods in tests"