Remove unused stuff from tests

Change-Id: Iddabfbc80378b02fa4a2c58f80d50241be8105d3
Merge "Remove unused stuff from tests"