Merge "Fix test calls for test_connectivity_fip_bmb1" into mcp/epoxy