Pass phpcs-strict on some test files (3/x)

Change-Id: I44172b512cd9b6c43806dad697e449bf06897305
Pass phpcs-strict on some test files (4/x)

Change-Id: Ifdbb431a6018c514b15ae71cc0c21b653a5e466d
Pass phpcs-strict on some test files (5/x)

Change-Id: I690645cd8a9b1165dcc8271b201c695ea9391226