Fixes for intermitantly failing governance tests