Fix unit test failures caused by recent flow changes
Merge pull request #40 from ashoksr/master

Fix unit test failures caused by recent flow changes