restructuring tests. Starting to add file fetching