added File and tests