Fix Scrutinizer issues 2
Update File class & test