Pass phpcs-strict on some test files (6/11)

Change-Id: I5f4bc0df8183cf338ff45cacfc7279c2cd38ee04