Merge "Fix another set of file related tests."