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