Remove unnecessarily created patchsets from the tests

Change-Id: I3ba712df766790ae4ab81260e4be87ccf2410fde
5 files changed