Merge pull request #72 from opennetworkinglab/devl/HA_stability

Fix some stability issues in HA Tests