More changes to the test projects.

Change-Id: I823bcc19b7de6cea4c985f2c01feccddd6f8022d
49 files changed