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

Change-Id: I138c1f9bf2c3c7e9218d5fa29365e78b309fb459
Merge "Pass phpcs-strict on some test files (8/11)"