test fixes for flow-sync and device delete issues

Change-Id: I8aa73bdf8ec0343fbc2cc623e5f5b5cc15e4ac8f
2 files changed