File fix + phpunit fix.