Some more PHPCS test fixes