Update to use FileCollection, all but tests.