Fixes for intermitantly failing governance tests
Merge pull request #987 from shenrie/master

Fixes for intermitantly failing governance tests