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