Added PHPCS fixes and better array diff handling on fixture data count difference