DataFeed modification and some tests