Update tests
Fix PHPCS