Added tests for DataFetcher. Adjusted some parts regarding the new DataFetcher