Batch fix for phpunit tests