all data sources and archive targets working in all combinations
merge conflict
fixed a broken test