Fix extended marince facility and agent governance test
Merge pull request #1060 from shenrie/master

Fix extended marince facility and agent governance test