Merge pull request #1752 from jamie-cyber1/fix_gov2

Fix gov test
Fix test_command_errors test