Remove unneeded methods in tests

Change-Id: Ia2da4027f2cc4a3aaff02695bab35de32a33ed60
Merge "Remove unneeded methods in tests"