Fix dataflow work

 * Unit test

Closes-bug: #1376682

Change-Id: I6fdd6f9cc705bf016646d5bd5fcf98bec450cadb
Merge "Fix dataflow work"