Fix flaky flowmanager tests

* Create expected flow-entries for subnet router-IPs in the same
sequence as processed by FlowManager
* Actually create expected entries for port-range test

Change-Id: I35e5514ee1d83bb4298adbd647b21574d97bb788
Signed-off-by: Amit Bose <bose@noironetworks.com>