Added File to tests.
Fixed conflicts.