Reduce V1.1 test fakes complexity to below 20

This patch reduces v1.1 fakes to below 20.

Change-Id: I7a51beda296a6d7f70d6f3b32695103ba162b3d1
Merge "Reduce V1.1 test fakes complexity to below 20"