[forge-commits] [forge/plugin-switchyard] bdacb6: Fix some test failures