missing @group Flow annotations on tests

Change-Id: Iad49f1ecde1922572d6a7ebeb6b056289d400d2d
Merge "missing @group Flow annotations on tests"