Reverted to old DataFlowSink implementation

Plus more tests