Fixing phpunit tests