Moved test resources to folder, merged data sources